Fix slashing around FOLDER_PREFIX variable.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

3 files changed, 26 insertions, 22 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/Manifest b/x11-drivers/ati-drivers/Manifest
index a927bfcc0941..49dadc2a6242 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -36,14 +36,14 @@ DIST ati-driver-installer-9-8-x86.x86_64.run 96243549 RMD160 c5d2a3a724f1d04eb20
 DIST fglrx-installer_8.660.orig.tar.gz 60964800 RMD160 f50e58cec30c22ad84914b2ec02d04450a885fa1 SHA1 0846f65bba364e3e4145513cf8be42aec9668504 SHA256 181fb2065a16cc75e279b229ac850fe30b8dd7899679117a0d9b815e85c38e66
 EBUILD ati-drivers-8.552-r2.ebuild 15132 RMD160 08693686e3a767576533c9625b6efaa0e727f5de SHA1 3f41f7bfc6e95f6520d5f38dbb6b05001db6b767 SHA256 059888be71be3759d9cd63cc4fa3300227ba9d99fcea1f32eb065ed5761aec79
 EBUILD ati-drivers-8.593.ebuild 15028 RMD160 b5c4cef44e3bc8de4d08860cf7032a0c83204d72 SHA1 c2a68ca3a777bc4851cedc7c3e78369fe4575d73 SHA256 09edac6fe290ef0ac6580e54ebea64d3bf80a317547e127bb73230f91b3dc08c
-EBUILD ati-drivers-8.660.ebuild 18452 RMD160 67328e6b209fd7dfb422731dd6d67464e9a6d6ee SHA1 63d26352e7f40562c05c37e65f6a24daffc5570e SHA256 eb0ec45ca1852d5b6708b6dbab8925e6e4ad3380e20b39aa509a98d7dbc8a230
+EBUILD ati-drivers-8.660.ebuild 18437 RMD160 91ec954f7b75128c2f04ac15dbe6165c50ce8996 SHA1 1d994bf0e6b01df1c892fa54500c07e8a61def01 SHA256 95ce6c2c5492302c42d474418a1288b1a4e2ec8643a30873797fe66db5b8abb2
 EBUILD ati-drivers-9.8.ebuild 17950 RMD160 eda2cbb5e73877b5865939e29ee78d8cf1eb4326 SHA1 2f48f61d3125ebed8c7c76e862fcf9c64eb1fa20 SHA256 38c6147980dbe97cf3bebc118a818a82d66885a3a2a0781e2c0a955451ddbd43
-MISC ChangeLog 58184 RMD160 e70e2da66a68eaeb3dc03a681b33f415de027be5 SHA1 cae72d3ece9dd5eb83c52ef8360a5c635f435228 SHA256 d77500aec4b97dce98581dee9c493bb78d1c3a01edeb6f8ddb259a7827a0c860
+MISC ChangeLog 58314 RMD160 0db810b59c8b6a43f10b94e8e9b70ea2416a851c SHA1 8868659c7cbd0927747bb483e847887ceafa8d2f SHA256 0345b1c7a680317675bf3d30d066516002d8f01aa563ab930732f89adee65d95
 MISC metadata.xml 359 RMD160 ece931b7435755393a605d11de0b9276a7a61785 SHA1 e8fe2ec8e95714ae50c71cadfa63cb92f85a1c5d SHA256 9dcb0fd39cbf80a8ef47d64e0a038f6bdcb49f106c0f810db1008e2bc56ee39b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqk8L0ACgkQHB6c3gNBRYe6OACgrPRodNvytCy7IdumvYSV1XxE
-XVAAoKchFxjEtbfSLRoXDz9oyIaQNSan
-=RJJd
+iEYEARECAAYFAkqlAaYACgkQHB6c3gNBRYfAOACfQ5Th1G1Pp8dRyLQwd/bNcejI
+XIEAn0tGAB59b7LLu2KDVBUJMa0aQb7T
+=DV6S
 -----END PGP SIGNATURE-----
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