Bump. Mostly removes cruft. Also sets the WINDOWPATH variable for anyone needing that.

Package-Manager: portage-2.1.3_rc6

5 files changed, 224 insertions, 5 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index e594f7c0d7a9..1ec1c3259781 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.92 2007/07/09 10:31:38 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.93 2007/07/14 05:02:48 dberkholz Exp $
+
+*xinit-1.0.4 (14 Jul 2007)
+
+  14 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/gentoo-startx-customization-1.0.4.patch, +xinit-1.0.4.ebuild:
+  Bump. Mostly removes cruft. Also sets the WINDOWPATH variable for anyone
+  needing that.
 
   09 Jul 2007; Roy Marples <uberlord@gentoo.org> files/xdm.initd-1:
   The xdm init script is now after modules, #179032.
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index c04f39cbd8b5..cda73a686f3e 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -10,6 +10,10 @@ AUX gentoo-startx-customization-0.99.4.patch 3965 RMD160 a1b2a04f2de1b40721536e7
 MD5 de00e8a136985faa77ce4bfa4e724ff8 files/gentoo-startx-customization-0.99.4.patch 3965
 RMD160 a1b2a04f2de1b40721536e75f224565cf0aba8c4 files/gentoo-startx-customization-0.99.4.patch 3965
 SHA256 9452459f4880b2de599a502425ccb6897386af5d0649772e6a67b6d0b0c568e8 files/gentoo-startx-customization-0.99.4.patch 3965
+AUX gentoo-startx-customization-1.0.4.patch 3863 RMD160 65d35c3aaf72861dbf393bb23aaac97763725891 SHA1 ab0acf592dfbdfe961489f3a417be350aefac1dd SHA256 eb0a88592a22203c9e7cb4ea3051f2b96adb244585ae4b990b384b6d8a35559c
+MD5 7522b7bd9e03f4b1a0f49636dbc933e7 files/gentoo-startx-customization-1.0.4.patch 3863
+RMD160 65d35c3aaf72861dbf393bb23aaac97763725891 files/gentoo-startx-customization-1.0.4.patch 3863
+SHA256 eb0a88592a22203c9e7cb4ea3051f2b96adb244585ae4b990b384b6d8a35559c files/gentoo-startx-customization-1.0.4.patch 3863
 AUX nolisten-tcp-and-black-background.patch 381 RMD160 f767995059b6b3826e662ad71fd9348609383dc2 SHA1 8210062a9e3bac93e9d5b0a18633e6a98a6829f4 SHA256 481252dd205a0eefcfdf1a265b2c359280363ceaf1460ca5eab42b9eb3b3c826
 MD5 8d14d094be7182b9870a0727a5d8e87b files/nolisten-tcp-and-black-background.patch 381
 RMD160 f767995059b6b3826e662ad71fd9348609383dc2 files/nolisten-tcp-and-black-background.patch 381
@@ -52,6 +56,7 @@ RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 files/xserver.pamd 125
 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 files/xserver.pamd 125
 DIST xinit-1.0.2.tar.bz2 96536 RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 SHA1 78a2fefebbe75a65682373fa22721c8789f55580 SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395
 DIST xinit-1.0.3.tar.bz2 97629 RMD160 e0299e1cb07d12400b9513752dccde1dc0d9cb78 SHA1 caab4f9b56fc76edd8500d596d46cf1a9794caff SHA256 c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186
+DIST xinit-1.0.4.tar.bz2 106555 RMD160 7a3fd5930dcb88c101842bcf9599de4632d9fed1 SHA1 cad1f17464f48e3c08f2d76af1206004cbdfa731 SHA256 1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52
 EBUILD xinit-1.0.2-r6.ebuild 1358 RMD160 c32f31baaa154332032489e16353975c27ad7195 SHA1 dfdf2c0c46cf5b6e30a51418407c5111184f5c7e SHA256 164e9ffb3cb0d89be29c1a34f5da21ffacf87c9cd80f0c963e83969f6457143b
 MD5 c21e5298031b5d61fc31480062eab6e2 xinit-1.0.2-r6.ebuild 1358
 RMD160 c32f31baaa154332032489e16353975c27ad7195 xinit-1.0.2-r6.ebuild 1358
@@ -72,10 +77,14 @@ EBUILD xinit-1.0.3.ebuild 1336 RMD160 4395f36048cc77b18430f512172cb11340a942e4 S
 MD5 24a82969244654b6d5f3c7fbf05b102b xinit-1.0.3.ebuild 1336
 RMD160 4395f36048cc77b18430f512172cb11340a942e4 xinit-1.0.3.ebuild 1336
 SHA256 aea3003858e5cec5d12e116e9a20496662c9d443193ca10a46d568b9af663c99 xinit-1.0.3.ebuild 1336
-MISC ChangeLog 14620 RMD160 4535effa1ad3155a8013bfdb33ad479897ea6b8e SHA1 05a6d0bed20f3dbbd552afaefe85faf05932d67f SHA256 7ce3c4813e9ef2ee41a400fc660304d58c19f43169c3f51fadb1d54b37513fca
-MD5 4c817c0ad8f0c3e86b339e5072ee0f37 ChangeLog 14620
-RMD160 4535effa1ad3155a8013bfdb33ad479897ea6b8e ChangeLog 14620
-SHA256 7ce3c4813e9ef2ee41a400fc660304d58c19f43169c3f51fadb1d54b37513fca ChangeLog 14620
+EBUILD xinit-1.0.4.ebuild 1346 RMD160 8139efe52cd8b82b06c8997a515f3e51f2ecf88a SHA1 2f7ea79ede877d66ac9d31f3c8cbb0c5d08a52df SHA256 63bd282dea6b5eb7b7f92920b5cf2864fef7d01085e55f1c688b1bd40e567799
+MD5 eafd8426b27e42529c9882c990b86867 xinit-1.0.4.ebuild 1346
+RMD160 8139efe52cd8b82b06c8997a515f3e51f2ecf88a xinit-1.0.4.ebuild 1346
+SHA256 63bd282dea6b5eb7b7f92920b5cf2864fef7d01085e55f1c688b1bd40e567799 xinit-1.0.4.ebuild 1346
+MISC ChangeLog 14867 RMD160 6b8a979c46d07b73bb217b2b2d8e43503671bd31 SHA1 c38b335fb46b8fa5c8479e349073b220e7a18796 SHA256 33db00b27ac0c1e9020d299493fc690ebf7e4e2d96674223c88effa14e41e108
+MD5 20ac4f6f6208e25dbb0e982d826afa44 ChangeLog 14867
+RMD160 6b8a979c46d07b73bb217b2b2d8e43503671bd31 ChangeLog 14867
+SHA256 33db00b27ac0c1e9020d299493fc690ebf7e4e2d96674223c88effa14e41e108 ChangeLog 14867
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -95,3 +104,6 @@ SHA256 a37b78e123e42af15479c362d492e682e687a13cb9c1f038ec3e395f12612242 files/di
 MD5 273fc0942d2b4ea4d51a2447ba6b1c77 files/digest-xinit-1.0.3-r4 235
 RMD160 427f07a6108e50a618c487041421ba91e25f146f files/digest-xinit-1.0.3-r4 235
 SHA256 a37b78e123e42af15479c362d492e682e687a13cb9c1f038ec3e395f12612242 files/digest-xinit-1.0.3-r4 235
+MD5 80032ce3a4d4269dbd6412e8129f009b files/digest-xinit-1.0.4 238
+RMD160 b02b7ff2477350b6bb9c45a6a64a39b327485848 files/digest-xinit-1.0.4 238
+SHA256 9232f41ed855c86ed71c95e580340c1b865ee6e1e9a548bf5c098eebaaf04ff6 files/digest-xinit-1.0.4 238
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.4 b/x11-apps/xinit/files/digest-xinit-1.0.4
new file mode 100644
index 000000000000..393ea098ac42
--- /dev/null
+++ b/x11-apps/xinit/files/digest-xinit-1.0.4
@@ -0,0 +1,3 @@
+MD5 9df52a504dc04313a6650fae364ae04a xinit-1.0.4.tar.bz2 106555
+RMD160 7a3fd5930dcb88c101842bcf9599de4632d9fed1 xinit-1.0.4.tar.bz2 106555
+SHA256 1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52 xinit-1.0.4.tar.bz2 106555
diff --git a/x11-apps/xinit/files/gentoo-startx-customization-1.0.4.patch b/x11-apps/xinit/files/gentoo-startx-customization-1.0.4.patch
new file mode 100644
index 000000000000..16ef63fbd91f
--- /dev/null
+++ b/x11-apps/xinit/files/gentoo-startx-customization-1.0.4.patch
@@ -0,0 +1,148 @@
+diff -urN xinit-1.0.4.orig/startx.cpp xinit-1.0.4/startx.cpp
+--- xinit-1.0.4.orig/startx.cpp	2007-07-13 21:54:34.000000000 -0700
++++ xinit-1.0.4/startx.cpp	2007-07-13 21:55:49.000000000 -0700
+@@ -64,8 +64,6 @@
+ 
+ userserverrc=$HOME/.xserverrc
+ sysserverrc=XINITDIR/xserverrc
+-defaultclient=XTERM
+-defaultserver=XSERVER
+ defaultclientargs=""
+ defaultserverargs=""
+ clientargs=""
+@@ -107,60 +105,41 @@
+ whoseargs="client"
+ while [ x"$1" != x ]; do
+     case "$1" in
+-    XCOMM '' required to prevent cpp from treating "/*" as a C comment.
+-    /''*|\./''*)
+-	if [ "$whoseargs" = "client" ]; then
+-	    if [ x"$clientargs" = x ]; then
+-		client="$1"
+-	    else
+-		clientargs="$clientargs $1"
+-	    fi
+-	else
+-	    if [ x"$serverargs" = x ]; then
+-		server="$1"
+-	    else
+-		serverargs="$serverargs $1"
+-	    fi
+-	fi
+-	;;
+-    --)
+-	whoseargs="server"
+-	;;
+-    *)
+-	if [ "$whoseargs" = "client" ]; then
+-	    clientargs="$clientargs $1"
+-	else
+-	    XCOMM display must be the FIRST server argument
+-	    if [ x"$serverargs" = x ] && @@
+-		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
+-		display="$1"
+-	    else
+-		serverargs="$serverargs $1"
+-	    fi
+-	fi
+-	;;
++      /''*|\.*)       if [ "$whoseargs" = "client" ]; then
++                  if [ "x$clientargs" = x ]; then
++                      clientargs="$1"
++                  else
++                      clientargs="$clientargs $1"
++                  fi
++              else
++                  if [ "x$serverargs" = x ]; then
++                      serverargs="$1"
++                  else
++                      serverargs="$serverargs $1"
++                  fi
++              fi ;;
++      --)     whoseargs="server" ;;
++      *)      if [ "$whoseargs" = "client" ]; then
++                  if [ "x$clientargs" = x ]; then
++                      clientargs="$defaultclientargs $1"
++                  else
++                      clientargs="$clientargs $1"
++                  fi
++              else
++                  case "$1" in
++                      :[0-9]*) display="$1"; serverargs="$serverargs $1";;
++                      *) serverargs="$serverargs $1" ;;
++                  esac
++              fi ;;
+     esac
+     shift
+ done
+ 
+-XCOMM process client arguments
+-if [ x"$client" = x ]; then
+-    XCOMM if no client arguments either, use rc file instead
+-    if [ x"$clientargs" = x ]; then
+-	client="$defaultclientargs"
+-    else
+-	client=$defaultclient
+-    fi
++if [ x"$clientargs" = x ]; then
++	clientargs="$defaultclientargs"
+ fi
+-
+-XCOMM process server arguments
+-if [ x"$server" = x ]; then
+-    XCOMM if no server arguments or display either, use rc file instead
+-    if [ x"$serverargs" = x -a x"$display" = x ]; then
+-	server="$defaultserverargs"
+-    else
+-	server=$defaultserver
+-    fi
++if [ x"$serverargs" = x ]; then
++	serverargs="$defaultserverargs"
+ fi
+ 
+ if [ x"$XAUTHORITY" = x ]; then
+@@ -217,15 +196,8 @@
+ 
+ #endif
+ 
+-#if defined(__SCO__) || defined(__UNIXWARE__)
+-if [ "$REMOTE_SERVER" = "TRUE" ]; then
+-        exec SHELL_CMD ${client}
+-else
+-        XINIT $client $clientargs -- $server $display $serverargs
+-fi
+-#else
+-XINIT $client $clientargs -- $server $display $serverargs
+-#endif
++cleanup() {
++    [ -n "$PID" ] && kill $PID > /dev/null 2>&1
+ 
+ if [ x"$removelist" != x ]; then
+     XAUTH remove $removelist
+@@ -251,3 +223,15 @@
+ #if defined(sun)
+ kbd_mode -a
+ #endif
++}
++
++
++trap cleanup 0
++
++xinit $clientargs -- $serverargs -deferglyphs 16 &
++
++PID=$!
++
++wait $PID
++
++unset PID
+diff -urN xinit-1.0.4.orig/xinit.c xinit-1.0.4/xinit.c
+--- xinit-1.0.4.orig/xinit.c	2007-07-13 21:54:34.000000000 -0700
++++ xinit-1.0.4/xinit.c	2007-07-13 21:59:14.000000000 -0700
+@@ -423,6 +423,7 @@
+ 	sigaction(SIGINT, &sa, NULL);
+ 	sigaction(SIGHUP, &sa, NULL);
+ 	sigaction(SIGPIPE, &sa, NULL);
++	sigaction(SIGTERM, &sa, NULL);
+ 
+ 	signal(SIGALRM, sigAlarm);
+ 	signal(SIGUSR1, sigUsr1);
diff --git a/x11-apps/xinit/xinit-1.0.4.ebuild b/x11-apps/xinit/xinit-1.0.4.ebuild
new file mode 100644
index 000000000000..c6cd52731cb2
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 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.1 2007/07/14 05:02:48 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+# This is enabled due to modified Makefile.am from the patches
+SNAPSHOT="yes"
+
+inherit x-modular pam
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="minimal"
+
+RDEPEND="x11-apps/xauth
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+PDEPEND="!minimal? ( x11-wm/twm
+				x11-apps/xclock
+				x11-apps/xrdb
+				x11-apps/xsm
+				x11-terms/xterm )"
+
+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
+
+	x-modular_reconf_source
+}
+
+src_install() {
+	x-modular_src_install
+	exeinto /etc/X11
+	doexe ${FILESDIR}/chooser.sh ${FILESDIR}/startDM.sh
+	exeinto /etc/X11/Sessions
+	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
+}