x11-apps/xinit: fix customizations patch (see bug #293342)

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

4 files changed, 22 insertions, 14 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 2efd383e4a74..a757bfed645d 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.166 2009/11/22 23:47:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.167 2009/11/28 21:37:04 remi Exp $
+
+*xinit-1.2.0-r2 (28 Nov 2009)
+
+  28 Nov 2009; Rémi Cardona <remi@gentoo.org>
+  files/0001-Gentoo-specific-customizations.patch, -xinit-1.2.0-r1.ebuild,
+  +xinit-1.2.0-r2.ebuild:
+  fix customizations patch (see bug #293342)
 
   22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> -files/xdm.initd-2:
   Drop stale patches.
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index b86d50dec23b..56b596f4ec64 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,5 +1,5 @@
 AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02629cd14f5f5fa8a56ec9421e0dc46b SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97
-AUX 0001-Gentoo-specific-customizations.patch 1507 RMD160 ebfea9e94009e6f3953393956e279f56ac37647d SHA1 237bff356f782f72025220df0e2382c85691a0e6 SHA256 7443079d7a1a9377d64cde033176660d776ae6b0fc787c0752e14a11a2e7167c
+AUX 0001-Gentoo-specific-customizations.patch 1512 RMD160 7b068c34f4e14950acfaccec44aea38e99ac7859 SHA1 4c44304545155786de197196e40903d6c0206c42 SHA256 371b17be87f3c077bd4ebfdc7a62b39c216a69ff8f986d4a658d492076ab4100
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
 AUX chooser.sh 1301 RMD160 4ebebef5d48d0b344f1c8af8baac60ece9671a12 SHA1 67f1afc86fb2788c6d75713bfb37550820360b5e SHA256 6ca40e2f592a10357d3396240213f0ebd81dd34882bab18bad2e9e94ad4036f0
 AUX gentoo-startx-customization-1.0.8.patch 3953 RMD160 cf0bc0b1439437b8a92a1f569445e8fbef1bb1cd SHA1 8020676fe7c9a2fed0c2a09cea0c273984a3cdc0 SHA256 29d6a004240672b86d6cc34e9cab5dcc88abcb84974d98b1085a9eb0dc852f38
@@ -17,6 +17,6 @@ AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfc
 DIST xinit-1.0.8.tar.bz2 117049 RMD160 d01b299e6e96c2b5318aaec479c81670b94e2129 SHA1 0102d2fdc0df3d24077ba826cf57640da46140af SHA256 06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524
 DIST xinit-1.2.0.tar.bz2 136781 RMD160 c2895db985482c13ef300a037bf2e182aeda1442 SHA1 85a838c2010f27ef6d09d6ec4b1208a66cc8d697 SHA256 ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f
 EBUILD xinit-1.0.8-r10.ebuild 2331 RMD160 35a7638e440f3f7ebbd9e41d67903e294749c3f2 SHA1 3639d3b4568131f8c97291ad9fd81f36bc6640c8 SHA256 f61e0d08fa32a23d6d583f56e87e5c7fc2d7154258a79bc684a94e3565a4a7fe
-EBUILD xinit-1.2.0-r1.ebuild 1897 RMD160 aa2b6c5af9f14de37d05e34e28c26e744c0648a5 SHA1 beec36b13f03e1fd2498e3a607c78cf8b7448615 SHA256 210569a6e135f3aa9426579272fc5d7862f2ccfec3ef807e6ecb9a1c0cd82983
-MISC ChangeLog 26456 RMD160 46c14a1538114fbb5cf89870c8e2826b9891450e SHA1 15652e338b551a6d0f12e13ecd1e872a59ccd9f8 SHA256 900e83809c83767d988a3374eab6841b6b9f9b44080a501263f2f51a7ae5ee05
+EBUILD xinit-1.2.0-r2.ebuild 1897 RMD160 66bf9649cebcd9dd06bcf20b8973394ddc23c916 SHA1 2c683d2eb848b9ce124bd85d329f13f927fcb9c2 SHA256 a58432fdf66d0759584e4f459acac8315724f835c61c83d2185690904e5c0de5
+MISC ChangeLog 26676 RMD160 90b96c3b8edebdb4467a7af4a4ace17d19772396 SHA1 a191075f7842e38a54b7f7398793a804dd571390 SHA256 a9adbd5a0adeddc07bb9ba1fcb8eaefe92fa363d3065299e634fc9dc87404ea6
 MISC metadata.xml 272 RMD160 d0b40c3604f1b076f4ea2ead421b7361de293dce SHA1 9105900f56ba880d256b70bce06dd1cb69b1d4e6 SHA256 0e394010bdee148e101784bb38e4b1cdb106da7e2e5a7fc4fde946c65d0e4f7d
diff --git a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch
index 94b909481778..6148de03353b 100644
--- a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch
+++ b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch
@@ -1,14 +1,14 @@
-From bba43805362a62c835ce2af34bc1087d9c442b19 Mon Sep 17 00:00:00 2001
+From 57ce122fe4092fa3bffbd61b04ab69ef32426920 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Tue, 17 Nov 2009 09:12:02 +0100
+Date: Sat, 28 Nov 2009 22:14:17 +0100
 Subject: [PATCH] Gentoo-specific customizations
 
 ---
- xinitrc.cpp |   28 ++++++++++++++++------------
- 1 files changed, 16 insertions(+), 12 deletions(-)
+ xinitrc.cpp |   29 +++++++++++++++++------------
+ 1 files changed, 17 insertions(+), 12 deletions(-)
 
 diff --git a/xinitrc.cpp b/xinitrc.cpp
-index 379b1f3..5b517ea 100644
+index 379b1f3..b6186df 100644
 --- a/xinitrc.cpp
 +++ b/xinitrc.cpp
 @@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
@@ -22,7 +22,7 @@ index 379b1f3..5b517ea 100644
  
  XCOMM merge in defaults and keymaps
  
-@@ -84,19 +84,23 @@ fi
+@@ -84,19 +84,24 @@ fi
  XCOMM This is the fallback case if nothing else is executed above
  #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
  
@@ -30,7 +30,6 @@ index 379b1f3..5b517ea 100644
 +if [ -n "`/etc/X11/chooser.sh`" ]; then
 +	command="`/etc/X11/chooser.sh`"
 +else
-+	command=XTERM -geometry 80x66+0+0 -name login
 +	failsafe="yes"
 +fi
  
@@ -54,8 +53,10 @@ index 379b1f3..5b517ea 100644
 +	XCLOCK -geometry 50x50-1+1 &
 +	XTERM -geometry 80x50+494+51 &
 +	XTERM -geometry 80x20+494-0 &
++	exec XTERM -geometry 80x66+0+0 -name login
++else
++	exec $command
 +fi
-+exec $command
 -- 
-1.6.5.2
+1.6.5.3
 
diff --git a/x11-apps/xinit/xinit-1.2.0-r1.ebuild b/x11-apps/xinit/xinit-1.2.0-r2.ebuild
index 8782e062dac7..9b819c68633d 100644
--- a/x11-apps/xinit/xinit-1.2.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.2.0-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.2.0-r1.ebuild,v 1.1 2009/11/17 08:45:48 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.0-r2.ebuild,v 1.1 2009/11/28 21:37:04 remi Exp $
 
 EAPI="2"