Fix slashing around FOLDER_PREFIX variable.

(Portage version: 2.2_rc38/cvs/Linux i686)

2 files changed, 21 insertions, 17 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index a4945bf3f8e5..2f93930e4dd9 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.185 2009/09/07 11:38:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.186 2009/09/07 12:50:16 scarabeus Exp $
+
+  07 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-8.660.ebuild:
+  Fix slashing around FOLDER_PREFIX variable.
 
   07 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-8.660.ebuild:
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild
index 12d95ae01b8a..cea4480cb0cb 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.660.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/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild,v 1.2 2009/09/07 11:38:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild,v 1.3 2009/09/07 12:50:17 scarabeus Exp $
 
 EAPI="2"
 
@@ -244,12 +244,12 @@ src_prepare() {
 	sed -i \
 		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
 		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}/etc/ati/authatieventsd.sh" \
+		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
 		|| die "sed failed."
 
 	# Since "who" is in coreutils, we're using that one instead of "finger".
 	sed -i -e 's:finger:who:' \
-		"${S}/${FOLDER_PREFIX}/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
 		|| die "Replacing 'finger' with 'who' failed."
 	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
 	# add function to detect default state.
@@ -273,7 +273,7 @@ src_prepare() {
 
 	mkdir extra || die "mkdir failed"
 	cd extra
-	unpack ./../${FOLDER_PREFIX}/usr/src/ati/fglrx_sample_source.tgz
+	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
 	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
 		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
 	# Add a category.
@@ -292,7 +292,7 @@ src_compile() {
 	# The -DUSE_GLU is needed to compile using nvidia headers
 	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
 	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/${FOLDER_PREFIX}/usr/include fgl_glxgears.c \
+		-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
 		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
 	eend $?
 
@@ -308,7 +308,7 @@ src_compile() {
 	ebegin "Building fglrx_gamma util"
 	cd "${S}"/extra/programs/fglrx_gamma
 	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../${FOLDER_PREFIX}/usr/X11R6/include -L../../lib/fglrx_gamma \
+		-I../../../${FOLDER_PREFIX}usr/X11R6/include -L../../lib/fglrx_gamma \
 		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
 		|| die "fglrx_gamma util build failed"
 	eend $?
@@ -395,34 +395,34 @@ src_install() {
 	# etc.
 	insinto /etc/ati
 	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
+	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
 	insopts -m0755
-	doins ${FOLDER_PREFIX}/etc/ati/authatieventsd.sh || die
+	doins ${FOLDER_PREFIX}etc/ati/authatieventsd.sh || die
 
 	# include.
 	insinto /usr
-	doins -r ${FOLDER_PREFIX}/usr/include || die
+	doins -r ${FOLDER_PREFIX}usr/include || die
 	insinto /usr/include/X11/extensions
-	doins ${FOLDER_PREFIX}/usr/X11R6/include/X11/extensions/fglrx_gamma.h || die
+	doins ${FOLDER_PREFIX}usr/X11R6/include/X11/extensions/fglrx_gamma.h || die
 
 	# Just the atigetsysteminfo.sh script.
 	into /usr
-	dosbin ${FOLDER_PREFIX}/usr/sbin/* || die
+	dosbin ${FOLDER_PREFIX}usr/sbin/* || die
 
 	# data files for the control panel.
 	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}/usr/share/ati || die
+	doins -r ${FOLDER_PREFIX}usr/share/ati || die
 	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}/usr/share/icons/ccc_{large,small}.xpm || die
+	doins ${FOLDER_PREFIX}usr/share/icons/ccc_{large,small}.xpm || die
 	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
 		ccc_large System
 
 	# doc.
-	dohtml -r ${FOLDER_PREFIX}/usr/share/doc/fglrx || die
+	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx || die
 
-	doman ${FOLDER_PREFIX}/usr/share/man/man8/atieventsd.8 || die
+	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 || die
 
-	pushd ${FOLDER_PREFIX}/usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
 
 	exeinto /etc/acpi
 	doexe ati-powermode.sh || die