Quoting.

(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 69 insertions, 66 deletions

diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.27.10.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.27.10.ebuild
index 2fcfb2c65b3f..8ac1263a5781 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.27.10.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.27.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.27.10.ebuild,v 1.6 2007/02/22 22:03:54 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.27.10.ebuild,v 1.7 2009/08/03 10:03:14 ssuominen Exp $
 
 IUSE="qt3"
 
@@ -15,9 +15,10 @@ SRC_URI="x86?	( ${ATI_URL}/ati-driver-installer-${PV}-x86.run )
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="amd64 x86"
 
-DEPEND="=x11-drivers/ati-drivers-${PV}*
+RDEPEND="=x11-drivers/ati-drivers-${PV}*
 	!>=x11-drivers/ati-drivers-8.33.6-r2
 	qt3? ( =x11-libs/qt-3* )"
+DEPEND="${RDEPEND}"
 
 ATIBIN="${D}/opt/ati/bin"
 SLOT="0"
@@ -25,46 +26,46 @@ SLOT="0"
 src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 	use x86 && MY_P="ati-driver-installer-${PV}-x86.run"
 	use amd64 && MY_P="ati-driver-installer-${PV}-x86_64.run"
 
 	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${MY_P} --extract ${WORKDIR} &> /dev/null
+	sh "${DISTDIR}"/${MY_P} --extract "${WORKDIR}" &> /dev/null
 	eend $? || die "unpack failed"
 
-	mkdir -p ${WORKDIR}/extra
+	mkdir -p "${WORKDIR}"/extra
 	einfo "Unpacking fglrx_sample_source.tgz..."
-	tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
-		${WORKDIR}/common/usr/src/ATI/fglrx_sample_source.tgz \
+	tar --no-same-owner -C "${WORKDIR}"/extra/ -zxf \
+		"${WORKDIR}"/common/usr/src/ATI/fglrx_sample_source.tgz \
 		|| die "Failed to unpack fglrx_sample_source.tgz!"
 	# Defining USE_GLU allows this to compile with NVIDIA headers just fine
 	sed -e \
 		"s:-I/usr/X11R6/include:-D USE_GLU -I/usr/include:" \
-		-i ${WORKDIR}/extra/fgl_glxgears/Makefile.Linux || die
+		-i "${WORKDIR}"/extra/fgl_glxgears/Makefile.Linux || die
 
-	mkdir -p ${WORKDIR}/extra/fglrx_panel
+	mkdir -p "${WORKDIR}"/extra/fglrx_panel
 	einfo "Unpacking fglrx_panel_sources.tgz..."
-	tar --no-same-owner -C ${WORKDIR}/extra/fglrx_panel/ -zxf \
-		${WORKDIR}/common/usr/src/ATI/fglrx_panel_sources.tgz \
+	tar --no-same-owner -C "${WORKDIR}"/extra/fglrx_panel/ -zxf \
+		"${WORKDIR}"/common/usr/src/ATI/fglrx_panel_sources.tgz \
 		|| die "Failed to unpack fglrx_panel_sources.tgz!"
-	cd ${WORKDIR}/extra/fglrx_panel
+	cd "${WORKDIR}"/extra/fglrx_panel
 #	epatch "${DISTDIR}/ati-drivers-extra-8.22.5-improvements.patch.bz2"
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-		-i ${WORKDIR}/extra/fglrx_panel/Makefile
+		-i "${WORKDIR}"/extra/fglrx_panel/Makefile
 	#workaround
-	cp ${FILESDIR}/fglrx_pp_proto.h ${WORKDIR}/extra/fglrx_panel
-	}
+	cp "${FILESDIR}"/fglrx_pp_proto.h "${WORKDIR}"/extra/fglrx_panel
+}
 
 src_compile() {
 	einfo "Building fgl_glxgears"
-	cd ${WORKDIR}/extra/fgl_glxgears
+	cd "${WORKDIR}"/extra/fgl_glxgears
 	make -f Makefile.Linux || ewarn "fgl_glxgears not build!"
 
 	if use qt3
 	then
 		einfo "Building the QT fglx panel..."
-		cd ${WORKDIR}/extra/fglrx_panel
+		cd "${WORKDIR}"/extra/fglrx_panel
 		emake || die
 	fi
 }
@@ -74,16 +75,16 @@ src_install() {
 
 	# Apps
 	exeinto /opt/ati/bin
-	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
+	doexe "${WORKDIR}"/extra/fgl_glxgears/fgl_glxgears
 
 	if use qt3
 	then
-		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
+		doexe "${WORKDIR}"/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
+		doins "${FILESDIR}"/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
-		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
+		doins "${WORKDIR}"/extra/fglrx_panel/ati.xpm
 	fi
 }
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.32.5.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.32.5.ebuild
index acb8450723b8..55ce1c96bbf1 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.32.5.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.32.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.32.5.ebuild,v 1.5 2007/02/22 22:03:54 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.32.5.ebuild,v 1.6 2009/08/03 10:03:14 ssuominen Exp $
 
 IUSE="qt3"
 
@@ -14,9 +14,10 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="amd64 x86"
 
-DEPEND="=x11-drivers/ati-drivers-${PV}*
+RDEPEND="=x11-drivers/ati-drivers-${PV}*
 	!>=x11-drivers/ati-drivers-8.33.6-r2
 	qt3? ( =x11-libs/qt-3* )"
+DEPEND="${RDEPEND}"
 
 ATIBIN="${D}/opt/ati/bin"
 SLOT="0"
@@ -24,44 +25,44 @@ SLOT="0"
 src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	sh "${DISTDIR}"/${A} --extract "${WORKDIR}" &> /dev/null
 	eend $? || die "unpack failed"
 
-	mkdir -p ${WORKDIR}/extra
+	mkdir -p "${WORKDIR}"/extra
 	einfo "Unpacking fglrx_sample_source.tgz..."
-	tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
-		${WORKDIR}/common/usr/src/ati/fglrx_sample_source.tgz \
+	tar --no-same-owner -C "${WORKDIR}"/extra/ -zxf \
+		"${WORKDIR}"/common/usr/src/ati/fglrx_sample_source.tgz \
 		|| die "Failed to unpack fglrx_sample_source.tgz!"
 	# Defining USE_GLU allows this to compile with NVIDIA headers just fine
 	sed -e \
 		"s:-I/usr/X11R6/include:-D USE_GLU -I/usr/include:" \
-		-i ${WORKDIR}/extra/fgl_glxgears/Makefile.Linux || die
+		-i "${WORKDIR}"/extra/fgl_glxgears/Makefile.Linux || die
 
-	mkdir -p ${WORKDIR}/extra/fglrx_panel
+	mkdir -p "${WORKDIR}"/extra/fglrx_panel
 	einfo "Unpacking fglrx_panel_sources.tgz..."
-	tar --no-same-owner -C ${WORKDIR}/extra/fglrx_panel/ -zxf \
-		${WORKDIR}/common/usr/src/ati/fglrx_panel_sources.tgz \
+	tar --no-same-owner -C "${WORKDIR}"/extra/fglrx_panel/ -zxf \
+		"${WORKDIR}"/common/usr/src/ati/fglrx_panel_sources.tgz \
 		|| die "Failed to unpack fglrx_panel_sources.tgz!"
-	cd ${WORKDIR}/extra/fglrx_panel
+	cd "${WORKDIR}"/extra/fglrx_panel
 #	epatch "${DISTDIR}/ati-drivers-extra-8.22.5-improvements.patch.bz2"
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-		-i ${WORKDIR}/extra/fglrx_panel/Makefile
+		-i "${WORKDIR}"/extra/fglrx_panel/Makefile
 	#workaround
-	cp ${FILESDIR}/fglrx_pp_proto.h ${WORKDIR}/extra/fglrx_panel
-	}
+	cp "${FILESDIR}"/fglrx_pp_proto.h "${WORKDIR}"/extra/fglrx_panel
+}
 
 src_compile() {
 	einfo "Building fgl_glxgears"
-	cd ${WORKDIR}/extra/fgl_glxgears
+	cd "${WORKDIR}"/extra/fgl_glxgears
 	make -f Makefile.Linux || ewarn "fgl_glxgears not build!"
 
 	if use qt3
 	then
 		einfo "Building the QT fglx panel..."
-		cd ${WORKDIR}/extra/fglrx_panel
+		cd "${WORKDIR}"/extra/fglrx_panel
 		emake || die
 	fi
 }
@@ -71,16 +72,16 @@ src_install() {
 
 	# Apps
 	exeinto /opt/ati/bin
-	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
+	doexe "${WORKDIR}"/extra/fgl_glxgears/fgl_glxgears
 
 	if use qt3
 	then
-		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
+		doexe "${WORKDIR}"/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
+		doins "${FILESDIR}"/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
-		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
+		doins "${WORKDIR}"/extra/fglrx_panel/ati.xpm
 	fi
 }
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.33.6.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.33.6.ebuild
index 27542ea23e32..8e91f1c7d4c1 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.33.6.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.33.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.33.6.ebuild,v 1.3 2007/02/22 22:03:54 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.33.6.ebuild,v 1.4 2009/08/03 10:03:14 ssuominen Exp $
 
 IUSE="qt3"
 
@@ -14,9 +14,10 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=x11-drivers/ati-drivers-${PV}*
+RDEPEND="=x11-drivers/ati-drivers-${PV}*
 	!>=x11-drivers/ati-drivers-8.33.6-r2
 	qt3? ( =x11-libs/qt-3* )"
+DEPEND="${RDEPEND}"
 
 ATIBIN="${D}/opt/ati/bin"
 SLOT="0"
@@ -24,44 +25,44 @@ SLOT="0"
 src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	sh "${DISTDIR}"/${A} --extract "${WORKDIR}" &> /dev/null
 	eend $? || die "unpack failed"
 
-	mkdir -p ${WORKDIR}/extra
+	mkdir -p "${WORKDIR}"/extra
 	einfo "Unpacking fglrx_sample_source.tgz..."
-	tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
-		${WORKDIR}/common/usr/src/ati/fglrx_sample_source.tgz \
+	tar --no-same-owner -C "${WORKDIR}"/extra/ -zxf \
+		"${WORKDIR}"/common/usr/src/ati/fglrx_sample_source.tgz \
 		|| die "Failed to unpack fglrx_sample_source.tgz!"
 	# Defining USE_GLU allows this to compile with NVIDIA headers just fine
 	sed -e \
 		"s:-I/usr/X11R6/include:-D USE_GLU -I/usr/include:" \
-		-i ${WORKDIR}/extra/fgl_glxgears/Makefile.Linux || die
+		-i "${WORKDIR}"/extra/fgl_glxgears/Makefile.Linux || die
 
-	mkdir -p ${WORKDIR}/extra/fglrx_panel
+	mkdir -p "${WORKDIR}"/extra/fglrx_panel
 	einfo "Unpacking fglrx_panel_sources.tgz..."
-	tar --no-same-owner -C ${WORKDIR}/extra/fglrx_panel/ -zxf \
-		${WORKDIR}/common/usr/src/ati/fglrx_panel_sources.tgz \
+	tar --no-same-owner -C "${WORKDIR}"/extra/fglrx_panel/ -zxf \
+		"${WORKDIR}"/common/usr/src/ati/fglrx_panel_sources.tgz \
 		|| die "Failed to unpack fglrx_panel_sources.tgz!"
-	cd ${WORKDIR}/extra/fglrx_panel
+	cd "${WORKDIR}"/extra/fglrx_panel
 #	epatch "${DISTDIR}/ati-drivers-extra-8.22.5-improvements.patch.bz2"
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-		-i ${WORKDIR}/extra/fglrx_panel/Makefile
+		-i "${WORKDIR}"/extra/fglrx_panel/Makefile
 	#workaround
-	cp ${FILESDIR}/fglrx_pp_proto.h ${WORKDIR}/extra/fglrx_panel
-	}
+	cp "${FILESDIR}"/fglrx_pp_proto.h "${WORKDIR}"/extra/fglrx_panel
+}
 
 src_compile() {
 	einfo "Building fgl_glxgears"
-	cd ${WORKDIR}/extra/fgl_glxgears
+	cd "${WORKDIR}"/extra/fgl_glxgears
 	make -f Makefile.Linux || ewarn "fgl_glxgears not build!"
 
 	if use qt3
 	then
 		einfo "Building the QT fglx panel..."
-		cd ${WORKDIR}/extra/fglrx_panel
+		cd "${WORKDIR}"/extra/fglrx_panel
 		emake || die
 	fi
 }
@@ -71,16 +72,16 @@ src_install() {
 
 	# Apps
 	exeinto /opt/ati/bin
-	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
+	doexe "${WORKDIR}"/extra/fgl_glxgears/fgl_glxgears
 
 	if use qt3
 	then
-		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
+		doexe "${WORKDIR}"/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
+		doins "${FILESDIR}"/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
-		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
+		doins "${WORKDIR}"/extra/fglrx_panel/ati.xpm
 	fi
 }