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 | 585da864c38d453a677c612c4d0103eac585ef6a (patch) | |
tree | 46cb71ac6e3b829916a13b4a802859ddc9d43b6d /kde-base/kdelibs | |
parent | Don't just define ED, it will be already defined and read-only in future EAPI... (diff) | |
download | historical-585da864c38d453a677c612c4d0103eac585ef6a.tar.gz historical-585da864c38d453a677c612c4d0103eac585ef6a.tar.bz2 historical-585da864c38d453a677c612c4d0103eac585ef6a.zip |
Don't use ED in an EAPI that does not declare it, same for EROOT (though kde4-base eclass sets it sneakily)
Package-Manager: portage-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/Manifest | 4 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.3.4.ebuild | 6 |
3 files changed, 10 insertions, 6 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/Manifest b/kde-base/kdelibs/Manifest index 17629768f6eb..d4b50f7d9fe0 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -25,6 +25,6 @@ DIST kdelibs-4.3.3.tar.bz2 10516364 RMD160 3d6a2c971cef12fb2cb9ba64a10200b2cf098 DIST kdelibs-4.3.4.tar.bz2 10518171 RMD160 0719043ddcf251a3fce4c2d4bfb1583e80c4b54d SHA1 1af2d185c88898b71f36b57f033e3a6d9839ab3d SHA256 c13799b16a7dc5fa65dd2576d7837cf65336f49b3674e64a28d7f11286910c7f EBUILD kdelibs-3.5.10-r6.ebuild 7413 RMD160 96f61256653c2e4ff5f691e6009de8e4dbf4f375 SHA1 494a9b1f108f1942f14a1ee059bde6004140dfc8 SHA256 76dd8b09af6455335e9763e8b0c22d16543244987097c6bdc722cbe5692c364c EBUILD kdelibs-4.3.3-r1.ebuild 6383 RMD160 0c73511c9c37367bce0affb7dfcfa2a573e5d248 SHA1 f10b55afba5533149e35ce09d63f784c7312c465 SHA256 721f32f3d216287007780b11d52f9a5ccd722ca6cf354704b81063dbe4e7d210 -EBUILD kdelibs-4.3.4.ebuild 8992 RMD160 613708dc68285878724160b8be47d7713f934490 SHA1 b601f2026ccc17b78fbb1ed3ee3ed8e66bba1300 SHA256 dc40fc974159c147431ec9f63ba195ac2c2137e11dfccd6a7cc5d51e0cb03b48 -MISC ChangeLog 110259 RMD160 62be16751579e54c365e9d600d310c1da7060b69 SHA1 7726527b6198b197f2cb64798419f92f35c929e6 SHA256 765c83f9aa2da337471021607811d94c484a9404c8d0527de970cfe87a2937fe +EBUILD kdelibs-4.3.4.ebuild 9006 RMD160 1a450e2c50a0230843473ded36e9f8075fbd9b38 SHA1 6c86ccd9bab0d81209c392fbdf5d60f977f56b03 SHA256 2adc956606313c84841eba0f83e3e13fb02e646fd92dc93f9fd5d0122d7da3f9 +MISC ChangeLog 110448 RMD160 8c46e4ff427433a70c14ca8ac0699b772e0c10d9 SHA1 2a47c06d077c9970b0614dd226d9427d489d6b0a SHA256 2443575d216e6418fe336a938e37127901e5a53a2be5aa54dad0a9d0ad760b95 MISC metadata.xml 421 RMD160 1ac2a2321b85031d1a7d25ff97fd87fd7376cc12 SHA1 473e157bcd1bfbef6704dbc47fbe86688973e79e SHA256 03af52377b9a607997590a9cda326fa515c4e21207bf33953cb0e67b5831336d 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() { |