Don't use ED or EROOT in an EAPI that does not declare it.

Package-Manager: portage-2.2.00.15134-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

4 files changed, 19 insertions, 16 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 4c41c4f17662..d48b98fdf4f1 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.197 2009/12/23 00:07:27 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.198 2009/12/23 12:02:23 grobian Exp $
+
+  23 Dec 2009; Fabian Groffen <grobian@gentoo.org> kdm-4.3.4.ebuild:
+  Don't use ED or EROOT in an EAPI that does not declare it.
 
   23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kdm-4.3.4.ebuild:
   Pull in changes from overlay and prefix support
diff --git a/kde-base/kdm/kdm-4.3.4.ebuild b/kde-base/kdm/kdm-4.3.4.ebuild
index bb4da80dbba6..d1f84f7bd4d2 100644
--- a/kde-base/kdm/kdm-4.3.4.ebuild
+++ b/kde-base/kdm/kdm-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/kdm/kdm-4.3.4.ebuild,v 1.2 2009/12/23 00:07:27 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.4.ebuild,v 1.3 2009/12/23 12:02:23 grobian Exp $
 
 EAPI="2"
 
@@ -65,11 +65,11 @@ src_install() {
 
 	# Customize the kdmrc configuration
 	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
-		"${ED}"/${PREFIX}/share/config/kdm/kdmrc \
+		"${D%/}${EPREFIX}"/${PREFIX}/share/config/kdm/kdmrc \
 		|| die "Failed to set SessionsDirs correctly."
 
 	# Don't install empty dir
-	rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions
+	rmdir "${D}${EKDEDIR}"/share/config/kdm/sessions
 }
 
 pkg_postinst() {
@@ -77,15 +77,15 @@ pkg_postinst() {
 
 	# Set the default kdm face icon if it's not already set by the system admin
 	# because this is user-overrideable in that way, it's not in src_install
-	if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then
-		mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	if [[ ! -e "${ROOT}${EKDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then
+		mkdir -p "${ROOT}${EKDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${EKDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${ROOT}${EKDEDIR}/share/apps/kdm/faces/.default.face.icon"
 	fi
-	if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
-		mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
+	if [[ ! -e "${ROOT}${EKDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
+		mkdir -p "${ROOT}${EKDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${EKDEDIR}/share/apps/kdm/pics/users/root1.png" \
+			"${ROOT}${EKDEDIR}/share/apps/kdm/faces/root.face.icon"
 	fi
 
 	if use consolekit; then
diff --git a/kde-base/krossjava/Manifest b/kde-base/krossjava/Manifest
index 84804ef8b353..cc4d874b083d 100644
--- a/kde-base/krossjava/Manifest
+++ b/kde-base/krossjava/Manifest
@@ -2,6 +2,6 @@ AUX krossjava-4.2.3_includes.patch 573 RMD160 17511c084bb188113546cf5e867a511715
 DIST kdebindings-4.3.3.tar.bz2 4881799 RMD160 587fd37cc2369a39fb1cf97e164afc40294f97b2 SHA1 34ddcfd5d338962b8623b9dd9c2b850a621e4040 SHA256 d182e110201ac9dc63dbdbc1baecf845b90a56d6ba2c9c0a5b34dee211358f8d
 DIST kdebindings-4.3.4.tar.bz2 4880929 RMD160 71bf95f667a5e3d7b165987e582ef9deafad0145 SHA1 0c7bf45bd3d81bf6aa1d2b085c17b4ce925c656b SHA256 bd07532289e9caa5b56d6adf8008babbe301d6e48bc378b4f3a9e96f685f3b1e
 EBUILD krossjava-4.3.3.ebuild 1341 RMD160 141b68125d684a09ffc251c547daa331f8fafccc SHA1 aa8e498bfab5ec0081223199690caf8bf9f61264 SHA256 827683aafe3101330d7d06c9292072f3c3f73d6c5b71d353440dc0a9b52d564a
-EBUILD krossjava-4.3.4.ebuild 1334 RMD160 0d9811a0aa2ea85f610d9a7dc048ef99b717957e SHA1 77df9c9d2dae5658ff9be49f41bb38dcd6886eca SHA256 a2cec018b17bcf14e8dd375a6f5630b0f4f9a896dea09efe29fb47d56d078ec8
-MISC ChangeLog 2455 RMD160 c7cdf226185fe2b3a9139bee1f0b7bc2d7bb93dc SHA1 7ef351ce128d39bcbfc5a49f9a9718b2446fc9bf SHA256 6c84d70ca71d6ce17e3d74796022ccec8bdbf2337486f7508da2a0a6f9c4951b
+EBUILD krossjava-4.3.4.ebuild 1337 RMD160 8649b9d1896c35a348bf0788c7b6d7d1bdcc1e95 SHA1 898fe7c2dada01bbe6a0446b08d094973a7c6191 SHA256 c3ea5d1eafd00a0560d663c2d4f562b82027f30cfe56186f3d87733c3d7be29a
+MISC ChangeLog 2586 RMD160 40c0849c63a9f18635ef406548fa38b384ef235e SHA1 c3acfcd503757ebe4a0fff4472fba32173bfb54a SHA256 6fa7a337bb90b600e05087a245a85504e61a150d6f2e0057ecca41bab5abf52c
 MISC metadata.xml 321 RMD160 1c9bbcab13cb180c109d2f9057fa7617023ddc3b SHA1 de6893f3efb267f4f5e8ccdbc610b6176a1980e2 SHA256 8807987b34c460c021e243de234498b311431850245a438b453084192db06133
diff --git a/kde-base/libkdeedu/Manifest b/kde-base/libkdeedu/Manifest
index b34dfb317cf4..1675e9b8f53a 100644
--- a/kde-base/libkdeedu/Manifest
+++ b/kde-base/libkdeedu/Manifest
@@ -1,6 +1,6 @@
 DIST kdeedu-4.3.3.tar.bz2 57944052 RMD160 97ebfc7d2eb4fd5cf21df32eae95efa26f835b86 SHA1 fde1b8a7e548077f6327c940ec530db8565b5968 SHA256 3527fdb100f8d9e821ae1c811780ab6c255fb29f2c8d4acfe18d72f067312998
 DIST kdeedu-4.3.4.tar.bz2 57962298 RMD160 1f5ab9a52dae38d245720796d4b69838006f6414 SHA1 ee646d57db11b761d8da33fc03c596c8f531eb9d SHA256 2820cd8698680a5bf8f07bd37f555c3277d0af8b4d72f9112d1dadcea0d42afd
 EBUILD libkdeedu-4.3.3.ebuild 616 RMD160 67a189d1f6eca404ba0672ccecb8a5b4c2245f7e SHA1 4f7aadc3a771a5ce7fb52f7761f0c1585566b9a8 SHA256 bca3c9ff51ac021759514ae71cdbf0b76ffa2c05abb6bc0e54628f903fdcdf45
-EBUILD libkdeedu-4.3.4.ebuild 607 RMD160 27f292be85950a90e98bed7d02a305fcd9d7e979 SHA1 7a2fcadf3a5bcf9d2a807e8a8aaae0b26f474c56 SHA256 bf45457f53b61c959d87507bc267645c3af7f8161f55fc20c81328f2d323dc69
-MISC ChangeLog 16386 RMD160 162255ff0bfe1841b23fa5ed8cce2b357c2b3f6b SHA1 26633685925a0ddbb64282522a9e636782bab16e SHA256 1d968a7ced791a0556121880a175bce6bb546c329c3b2d069a344b88aee072bb
+EBUILD libkdeedu-4.3.4.ebuild 610 RMD160 45eedad242262176efdacbb58a37925dbb7aadf8 SHA1 8e2891cead1ce54fad04d2d00110be85f573b8c7 SHA256 6c7af67587a597e7880ef4417218e3fedae327c07c479efc6a71536c014365b5
+MISC ChangeLog 16540 RMD160 840a3038a4caad222c897d932f9b39d9aa91049c SHA1 5f6d42bbac0cba2c74b8ac44878a5e651f198797 SHA256 cefb22915f3f7f79f8688edfe018ef630110978c8a0805889bf74f7b081afa65
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a