Fix for Prefix, bug #367651

(Portage version: 2.2.01.18890-prefix/cvs/SunOS i386)

4 files changed, 16 insertions, 11 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f7c4ad086cb9..8fc7afa9f6b8 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.402 2011/07/20 09:04:40 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.403 2011/07/20 12:02:45 grobian Exp $
+
+  20 Jul 2011; Fabian Groffen <grobian@gentoo.org>
+  chromium-13.0.782.41-r1.ebuild, chromium-14.0.825.0.ebuild,
+  chromium-9999-r1.ebuild:
+  Fix for Prefix, bug #367651
 
   20 Jul 2011; Alex Alexander <wired@gentoo.org>
   +files/chromium-icu-compatibility-r0.patch, chromium-14.0.825.0.ebuild:
diff --git a/www-client/chromium/chromium-13.0.782.41-r1.ebuild b/www-client/chromium/chromium-13.0.782.41-r1.ebuild
index c89cf1ba7a3c..ede13143e566 100644
--- a/www-client/chromium/chromium-13.0.782.41-r1.ebuild
+++ b/www-client/chromium/chromium-13.0.782.41-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.41-r1.ebuild,v 1.2 2011/07/18 17:12:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.41-r1.ebuild,v 1.3 2011/07/20 12:02:45 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -380,7 +380,7 @@ src_install() {
 	make_desktop_entry chromium-browser "Chromium" chromium-browser \
 		"Network;WebBrowser"
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
 
 	# Install GNOME default application entry (bug #303100).
 	if use gnome; then
diff --git a/www-client/chromium/chromium-14.0.825.0.ebuild b/www-client/chromium/chromium-14.0.825.0.ebuild
index 1da5455d7c07..e70b61f4d73d 100644
--- a/www-client/chromium/chromium-14.0.825.0.ebuild
+++ b/www-client/chromium/chromium-14.0.825.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.825.0.ebuild,v 1.3 2011/07/20 09:04:40 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.825.0.ebuild,v 1.4 2011/07/20 12:02:45 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -377,7 +377,7 @@ src_install() {
 	make_desktop_entry chromium-browser "Chromium" chromium-browser \
 		"Network;WebBrowser"
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
 
 	# Install GNOME default application entry (bug #303100).
 	if use gnome; then
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 177c385dade4..12ee106f01a6 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.37 2011/07/19 21:56:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.38 2011/07/20 12:02:45 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -321,11 +321,11 @@ src_install() {
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	sed "s:chromium-browser:chromium-browser${SUFFIX}:g" \
-		-i "${D}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
 	sed "s:chromium.desktop:chromium${SUFFIX}.desktop:g" \
-		-i "${D}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
 	sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${SUFFIX}:" \
-		-i "${D}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
 
 	# It is important that we name the target "chromium-browser",
 	# xdg-utils expect it; bug #355517.
@@ -406,7 +406,7 @@ src_install() {
 	make_desktop_entry chromium-browser${SUFFIX} "Chromium ${SLOT}" chromium-browser${SUFFIX} \
 		"Network;WebBrowser"
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
 
 	# Install GNOME default application entry (bug #303100).
 	if use gnome; then
@@ -414,7 +414,7 @@ src_install() {
 		insinto /usr/share/gnome-control-center/default-apps
 		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${SUFFIX}.xml || die
 		sed "s:chromium-browser:chromium-browser${SUFFIX}:g" -i \
-			"${D}"/usr/share/gnome-control-center/default-apps/chromium-browser${SUFFIX}.xml
+			"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${SUFFIX}.xml
 	fi
 }