diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-12-23 11:54:25 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-12-23 11:54:25 +0000 |
| commit | 127fda0b0980adbf7bc252bcf3314f3b5a923350 (patch) | |
| tree | e45bb885abe3aa2015a96079666cb0424b23155b /kde-base/kdelibs | |
| parent | Don't just define ED, it will be already defined and read-only in future EAPI... (diff) | |
| download | gentoo-2-127fda0b0980adbf7bc252bcf3314f3b5a923350.tar.gz gentoo-2-127fda0b0980adbf7bc252bcf3314f3b5a923350.tar.bz2 gentoo-2-127fda0b0980adbf7bc252bcf3314f3b5a923350.zip | |
Don't use ED in an EAPI that does not declare it, same for EROOT (though kde4-base eclass sets it sneakily)
(Portage version: 2.2.00.15134-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.3.4.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index c593bed9faa3..2fdf85b8c707 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.657 2009/12/22 23:50:11 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.658 2009/12/23 11:54:25 grobian Exp $ + + 23 Dec 2009; Fabian Groffen <grobian@gentoo.org> kdelibs-4.3.4.ebuild: + Don't use ED in an EAPI that does not declare it, same for EROOT (though + kde4-base eclass sets it sneakily) 22 Dec 2009; Jonathan Callen <abcd@gentoo.org> +files/kdelibs-4.3.1-kdeui_util_kkeyserver_mac.patch, diff --git a/kde-base/kdelibs/kdelibs-4.3.4.ebuild b/kde-base/kdelibs/kdelibs-4.3.4.ebuild index 28d2f7a665f5..11c0b96c2709 100644 --- a/kde-base/kdelibs/kdelibs-4.3.4.ebuild +++ b/kde-base/kdelibs/kdelibs-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/kdelibs/kdelibs-4.3.4.ebuild,v 1.5 2009/12/22 23:50:11 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.4.ebuild,v 1.6 2009/12/23 11:54:25 grobian Exp $ EAPI="2" @@ -260,7 +260,7 @@ src_install() { #sed -i -e \ # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ - "${ED}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \ + "${D}"/${EKDEDIR}/share/apps/cmake/modules/FindXKB.cmake \ || die "failed fixing FindXKB.cmake" fi } @@ -295,7 +295,7 @@ pkg_postinst() { pkg_prerm() { # Remove ksycoca4 global database - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 + rm -f "${ROOT%/}${EPREFIX}${PREFIX}"/share/kde4/services/ksycoca4 } pkg_postrm() { |