--- /usr/portage/www-servers/apache/apache-2.4.7.ebuild	2013-11-26 01:31:35.000000000 -0700
+++ apache-2.4.7.ebuild	2013-12-01 12:59:05.850920328 -0700
@@ -152,21 +152,21 @@
 src_install() {
 	apache-2_src_install
 	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
-		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
 	done
 	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
-		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
 	done
 	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
-		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
 	done
 	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
-		rm "${D}/"$i || die "Failed to prune apache-tools bits"
+		rm "${ED}/"$i || die "Failed to prune apache-tools bits"
 	done
 
 	# well, actually installing things makes them more installed, I guess?
-	cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
-	chmod 0755 "${D}"/usr/sbin/apxs
+	cp "${S}"/support/apxs "${ED}"/usr/sbin/apxs || die "Failed to install apxs"
+	chmod 0755 "${ED}"/usr/sbin/apxs
 
 	# Note: wait for mod_systemd to be included in the next release,
 	# then apache2.4.service can be used and systemd support controlled