8 files changed, 41 insertions, 36 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 44bfcc77274c..b459bc2b59f5 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.126 2009/05/04 15:01:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.127 2009/05/05 08:24:54 fauli Exp $
+
+  05 May 2009; Christian Faulhammer <fauli@gentoo.org> xinit-1.0.4.ebuild,
+  xinit-1.0.5-r1.ebuild, xinit-1.0.5-r2.ebuild, xinit-1.0.8.ebuild,
+  xinit-1.0.8-r2.ebuild, xinit-1.0.8-r3.ebuild, xinit-1.0.8-r4.ebuild:
+  fix repoman warnings
 
   04 May 2009; Samuli Suominen <ssuominen@gentoo.org> xinit-1.0.5-r1.ebuild,
   xinit-1.0.5-r2.ebuild, xinit-1.0.8.ebuild, xinit-1.0.8-r2.ebuild,
diff --git a/x11-apps/xinit/xinit-1.0.4.ebuild b/x11-apps/xinit/xinit-1.0.4.ebuild
index 297f9a761ef2..faaae492f3c8 100644
--- a/x11-apps/xinit/xinit-1.0.4.ebuild
+++ b/x11-apps/xinit/xinit-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/xinit/xinit-1.0.4.ebuild,v 1.9 2008/04/09 02:08:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.4.ebuild,v 1.10 2009/05/05 08:24:54 fauli Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
@@ -23,14 +23,14 @@ PDEPEND="!minimal? ( x11-wm/twm
 				x11-apps/xsm
 				x11-terms/xterm )"
 
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-${PV}.patch"
+PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
+	"${FILESDIR}"/gentoo-startx-customization-${PV}.patch )
 
 src_unpack() {
 	x-modular_unpack_source
 	x-modular_patch_source
 
-	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" ${S}/Makefile.am
+	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" "${S}"/Makefile.am
 
 	x-modular_reconf_source
 }
@@ -38,12 +38,12 @@ src_unpack() {
 src_install() {
 	x-modular_src_install
 	exeinto /etc/X11
-	doexe ${FILESDIR}/chooser.sh ${FILESDIR}/startDM.sh
+	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
 	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Xsession
+	doexe "${FILESDIR}"/Xsession
 	exeinto /etc/X11/xinit
-	doexe ${FILESDIR}/xinitrc
-	newinitd ${FILESDIR}/xdm.initd-1 xdm
-	newconfd ${FILESDIR}/xdm.confd-1 xdm
-	newpamd ${FILESDIR}/xserver.pamd xserver
+	doexe "${FILESDIR}"/xinitrc
+	newinitd "${FILESDIR}"/xdm.initd-1 xdm
+	newconfd "${FILESDIR}"/xdm.confd-1 xdm
+	newpamd "${FILESDIR}"/xserver.pamd xserver
 }
diff --git a/x11-apps/xinit/xinit-1.0.5-r1.ebuild b/x11-apps/xinit/xinit-1.0.5-r1.ebuild
index 9f7693e93a38..89b0f7402fa5 100644
--- a/x11-apps/xinit/xinit-1.0.5-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.0.5-r1.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-apps/xinit/xinit-1.0.5-r1.ebuild,v 1.13 2009/05/04 15:01:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild,v 1.14 2009/05/05 08:24:54 fauli Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
@@ -24,9 +24,9 @@ PDEPEND="!minimal? ( x11-wm/twm
 				x11-apps/xsm
 				x11-terms/xterm )"
 
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-1.0.4.patch
-	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
+	"${FILESDIR}"/gentoo-startx-customization-1.0.4.patch
+	"${FILESDIR}"/xinit-1.0.4-console-kit.patch )
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_with hal consolekit)"
diff --git a/x11-apps/xinit/xinit-1.0.5-r2.ebuild b/x11-apps/xinit/xinit-1.0.5-r2.ebuild
index aedc11582b46..7a932af65c33 100644
--- a/x11-apps/xinit/xinit-1.0.5-r2.ebuild
+++ b/x11-apps/xinit/xinit-1.0.5-r2.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-apps/xinit/xinit-1.0.5-r2.ebuild,v 1.2 2009/05/04 15:01:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r2.ebuild,v 1.3 2009/05/05 08:24:54 fauli Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
@@ -24,9 +24,9 @@ PDEPEND="!minimal? ( x11-wm/twm
 				x11-apps/xsm
 				x11-terms/xterm )"
 
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-1.0.4.patch
-	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
+	"${FILESDIR}"/gentoo-startx-customization-1.0.4.patch
+	"${FILESDIR}"/xinit-1.0.4-console-kit.patch )
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_with hal consolekit)"
diff --git a/x11-apps/xinit/xinit-1.0.8-r2.ebuild b/x11-apps/xinit/xinit-1.0.8-r2.ebuild
index 04a64518c0bf..a7566deb9a2f 100644
--- a/x11-apps/xinit/xinit-1.0.8-r2.ebuild
+++ b/x11-apps/xinit/xinit-1.0.8-r2.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-apps/xinit/xinit-1.0.8-r2.ebuild,v 1.2 2009/05/04 15:01:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r2.ebuild,v 1.3 2009/05/05 08:24:54 fauli Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
@@ -24,9 +24,9 @@ PDEPEND="!minimal? ( x11-wm/twm
 				x11-apps/xsm
 				x11-terms/xterm )"
 
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-1.0.8.patch
-	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
+	"${FILESDIR}"/gentoo-startx-customization-1.0.8.patch
+	"${FILESDIR}"/xinit-1.0.4-console-kit.patch )
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_with hal consolekit)"
diff --git a/x11-apps/xinit/xinit-1.0.8-r3.ebuild b/x11-apps/xinit/xinit-1.0.8-r3.ebuild
index 666da33b4cac..9a5188fff231 100644
--- a/x11-apps/xinit/xinit-1.0.8-r3.ebuild
+++ b/x11-apps/xinit/xinit-1.0.8-r3.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-apps/xinit/xinit-1.0.8-r3.ebuild,v 1.3 2009/05/04 15:01:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r3.ebuild,v 1.4 2009/05/05 08:24:54 fauli Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
@@ -24,9 +24,9 @@ PDEPEND="!minimal? ( x11-wm/twm
 				x11-apps/xsm
 				x11-terms/xterm )"
 
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-1.0.8.patch
-	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
+	"${FILESDIR}"/gentoo-startx-customization-1.0.8.patch
+	"${FILESDIR}"/xinit-1.0.4-console-kit.patch )
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_with hal consolekit)"
diff --git a/x11-apps/xinit/xinit-1.0.8-r4.ebuild b/x11-apps/xinit/xinit-1.0.8-r4.ebuild
index 32f4186c5a90..96ffa9bfc6e7 100644
--- a/x11-apps/xinit/xinit-1.0.8-r4.ebuild
+++ b/x11-apps/xinit/xinit-1.0.8-r4.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-apps/xinit/xinit-1.0.8-r4.ebuild,v 1.9 2009/05/04 15:01:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r4.ebuild,v 1.10 2009/05/05 08:24:54 fauli Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
@@ -24,9 +24,9 @@ PDEPEND="!minimal? ( x11-wm/twm
 				x11-apps/xsm
 				x11-terms/xterm )"
 
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-1.0.8.patch
-	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
+	"${FILESDIR}"/gentoo-startx-customization-1.0.8.patch
+	"${FILESDIR}"/xinit-1.0.4-console-kit.patch )
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_with hal consolekit)"
diff --git a/x11-apps/xinit/xinit-1.0.8.ebuild b/x11-apps/xinit/xinit-1.0.8.ebuild
index c16651967aa5..dd53128ab22d 100644
--- a/x11-apps/xinit/xinit-1.0.8.ebuild
+++ b/x11-apps/xinit/xinit-1.0.8.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-apps/xinit/xinit-1.0.8.ebuild,v 1.2 2009/05/04 15:01:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8.ebuild,v 1.3 2009/05/05 08:24:54 fauli Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
@@ -24,9 +24,9 @@ PDEPEND="!minimal? ( x11-wm/twm
 				x11-apps/xsm
 				x11-terms/xterm )"
 
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-1.0.8.patch
-	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
+	"${FILESDIR}"/gentoo-startx-customization-1.0.8.patch
+	"${FILESDIR}"/xinit-1.0.4-console-kit.patch )
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_with hal consolekit)"