Fix quoting issues caught by latest repoman.

(Portage version: 2.1.3.12)

5 files changed, 86 insertions, 81 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index de4564ea186f..4042afb90253 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.286 2007/10/02 20:05:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.287 2007/10/09 07:22:49 dberkholz Exp $
+
+  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild,
+  xorg-server-1.3.0.0-r1.ebuild, xorg-server-1.4-r1.ebuild:
+  Fix quoting issues caught by latest repoman.
 
   02 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   xorg-server-1.3.0.0-r1.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild b/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
index b09d7ab01676..8a228d5d1e45 100644
--- a/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild,v 1.14 2007/09/09 19:49:42 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild,v 1.15 2007/10/09 07:22:49 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -378,8 +378,8 @@ pkg_postinst() {
 pkg_postrm() {
 	# Get rid of module dir to ensure opengl-update works properly
 	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
 		fi
 	fi
 }
@@ -408,7 +408,7 @@ kdrive_setup() {
 
 		# Check whether it's a valid kdrive server before we waste time
 		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
+		if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then
 			continue
 		fi
 
@@ -446,7 +446,7 @@ kdrive_setup() {
 			ebegin "  ${real_card}"
 			sed -i \
 				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
+				"${S}"/hw/kdrive/Makefile.am \
 				|| die "sed of ${real_card} failed"
 			eend
 		fi
@@ -458,7 +458,7 @@ kdrive_setup() {
 	if ! use video_cards_siliconmotion && ! use video_cards_via; then
 		sed -i \
 			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
+			"${S}"/hw/kdrive/Makefile.am
 	fi
 }
 
@@ -467,9 +467,9 @@ dynamic_libgl_install() {
 	ebegin "Moving GL files for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
 			fi
 		done
 	eend 0
@@ -479,10 +479,10 @@ server_based_install() {
 	use xprint && xprint_src_install
 
 	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
 	fi
 }
 
@@ -498,21 +498,21 @@ switch_opengl_implem() {
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/hw/xprint/etc/init.d/xprint
+	doexe "${S}"/hw/xprint/etc/init.d/xprint
 	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
+	newinitd "${FILESDIR}"/xprint.init xprint
 	# Install profile scripts
 	insinto /etc/profile.d
-	doins ${S}/hw/xprint/etc/profile.d/xprint*
+	doins "${S}"/hw/xprint/etc/profile.d/xprint*
 	insinto /etc/X11/xinit/xinitrc.d
-	doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
+	doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
 	# Patch profile scripts
 	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
+		get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \
+		"${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
 	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
+	dodoc "${D}"/etc/profile.d/xprint*
+	rm -f "${D}"/etc/profile.d/xprint*
 }
 
 ensure_a_server_is_building() {
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild
index 461e31626986..50008e4aa546 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild,v 1.8 2007/10/02 20:05:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild,v 1.9 2007/10/09 07:22:49 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -386,8 +386,8 @@ pkg_postinst() {
 pkg_postrm() {
 	# Get rid of module dir to ensure opengl-update works properly
 	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
 		fi
 	fi
 }
@@ -416,7 +416,7 @@ kdrive_setup() {
 
 		# Check whether it's a valid kdrive server before we waste time
 		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
+		if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then
 			continue
 		fi
 
@@ -454,7 +454,7 @@ kdrive_setup() {
 			ebegin "  ${real_card}"
 			sed -i \
 				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
+				"${S}"/hw/kdrive/Makefile.am \
 				|| die "sed of ${real_card} failed"
 			eend
 		fi
@@ -466,7 +466,7 @@ kdrive_setup() {
 	if ! use video_cards_siliconmotion && ! use video_cards_via; then
 		sed -i \
 			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
+			"${S}"/hw/kdrive/Makefile.am
 	fi
 }
 
@@ -475,9 +475,9 @@ dynamic_libgl_install() {
 	ebegin "Moving GL files for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
 			fi
 		done
 	eend 0
@@ -487,10 +487,10 @@ server_based_install() {
 	use xprint && xprint_src_install
 
 	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
 	fi
 }
 
@@ -506,21 +506,21 @@ switch_opengl_implem() {
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/hw/xprint/etc/init.d/xprint
+	doexe "${S}"/hw/xprint/etc/init.d/xprint
 	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
+	newinitd "${FILESDIR}"/xprint.init xprint
 	# Install profile scripts
 	insinto /etc/profile.d
-	doins ${S}/hw/xprint/etc/profile.d/xprint*
+	doins "${S}"/hw/xprint/etc/profile.d/xprint*
 	insinto /etc/X11/xinit/xinitrc.d
-	doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
+	doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
 	# Patch profile scripts
 	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
+		get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \
+		"${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
 	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
+	dodoc "${D}"/etc/profile.d/xprint*
+	rm -f "${D}"/etc/profile.d/xprint*
 }
 
 ensure_a_server_is_building() {
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
index c103d5f987c8..bc790a3dc2b6 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.27 2007/09/28 05:03:32 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.28 2007/10/09 07:22:49 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -385,8 +385,8 @@ pkg_postinst() {
 pkg_postrm() {
 	# Get rid of module dir to ensure opengl-update works properly
 	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
 		fi
 	fi
 }
@@ -415,7 +415,7 @@ kdrive_setup() {
 
 		# Check whether it's a valid kdrive server before we waste time
 		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
+		if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then
 			continue
 		fi
 
@@ -453,7 +453,7 @@ kdrive_setup() {
 			ebegin "  ${real_card}"
 			sed -i \
 				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
+				"${S}"/hw/kdrive/Makefile.am \
 				|| die "sed of ${real_card} failed"
 			eend
 		fi
@@ -465,7 +465,7 @@ kdrive_setup() {
 	if ! use video_cards_siliconmotion && ! use video_cards_via; then
 		sed -i \
 			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
+			"${S}"/hw/kdrive/Makefile.am
 	fi
 }
 
@@ -474,9 +474,9 @@ dynamic_libgl_install() {
 	ebegin "Moving GL files for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
 			fi
 		done
 	eend 0
@@ -486,10 +486,10 @@ server_based_install() {
 	use xprint && xprint_src_install
 
 	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
 	fi
 }
 
@@ -505,21 +505,21 @@ switch_opengl_implem() {
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/hw/xprint/etc/init.d/xprint
+	doexe "${S}"/hw/xprint/etc/init.d/xprint
 	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
+	newinitd "${FILESDIR}"/xprint.init xprint
 	# Install profile scripts
 	insinto /etc/profile.d
-	doins ${S}/hw/xprint/etc/profile.d/xprint*
+	doins "${S}"/hw/xprint/etc/profile.d/xprint*
 	insinto /etc/X11/xinit/xinitrc.d
-	doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
+	doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
 	# Patch profile scripts
 	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
+		get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \
+		"${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
 	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
+	dodoc "${D}"/etc/profile.d/xprint*
+	rm -f "${D}"/etc/profile.d/xprint*
 }
 
 ensure_a_server_is_building() {
diff --git a/x11-base/xorg-server/xorg-server-1.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
index b741d490fe0b..f90d74770417 100644
--- a/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v 1.6 2007/10/01 14:32:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v 1.7 2007/10/09 07:22:49 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -410,8 +410,8 @@ pkg_postinst() {
 pkg_postrm() {
 	# Get rid of module dir to ensure opengl-update works properly
 	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
 		fi
 	fi
 }
@@ -440,7 +440,7 @@ kdrive_setup() {
 
 		# Check whether it's a valid kdrive server before we waste time
 		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
+		if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then
 			continue
 		fi
 
@@ -478,7 +478,7 @@ kdrive_setup() {
 			ebegin "  ${real_card}"
 			sed -i \
 				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
+				"${S}"/hw/kdrive/Makefile.am \
 				|| die "sed of ${real_card} failed"
 			eend
 		fi
@@ -490,7 +490,7 @@ kdrive_setup() {
 	if ! use video_cards_siliconmotion && ! use video_cards_via; then
 		sed -i \
 			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
+			"${S}"/hw/kdrive/Makefile.am
 	fi
 }
 
@@ -499,9 +499,9 @@ dynamic_libgl_install() {
 	ebegin "Moving GL files for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
 			fi
 		done
 	eend 0
@@ -511,10 +511,10 @@ server_based_install() {
 	use xprint && xprint_src_install
 
 	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
 	fi
 }
 
@@ -530,21 +530,21 @@ switch_opengl_implem() {
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/hw/xprint/etc/init.d/xprint
+	doexe "${S}"/hw/xprint/etc/init.d/xprint
 	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
+	newinitd "${FILESDIR}"/xprint.init xprint
 	# Install profile scripts
 	insinto /etc/profile.d
-	doins ${S}/hw/xprint/etc/profile.d/xprint*
+	doins "${S}"/hw/xprint/etc/profile.d/xprint*
 	insinto /etc/X11/xinit/xinitrc.d
-	doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
+	doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
 	# Patch profile scripts
 	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
+		get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \
+		"${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
 	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
+	dodoc "${D}"/etc/profile.d/xprint*
+	rm -f "${D}"/etc/profile.d/xprint*
 }
 
 ensure_a_server_is_building() {