x11-apps/xinit: update Gentoo patch to fix bug #295616

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

4 files changed, 17 insertions, 10 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index e947e9115c0a..217ecc44bb1f 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.168 2009/11/28 21:53:06 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.169 2009/12/08 22:14:12 remi Exp $
+
+*xinit-1.2.0-r3 (08 Dec 2009)
+
+  08 Dec 2009; Rémi Cardona <remi@gentoo.org>
+  files/0001-Gentoo-specific-customizations.patch, -xinit-1.2.0-r2.ebuild,
+  +xinit-1.2.0-r3.ebuild:
+  update Gentoo patch to fix bug #295616
 
   28 Nov 2009; Rémi Cardona <remi@gentoo.org> metadata.xml:
   add blurb in metadata.xml, see bug #293507
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 43b1dee87393..9d7cea22fa79 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 1512 RMD160 7b068c34f4e14950acfaccec44aea38e99ac7859 SHA1 4c44304545155786de197196e40903d6c0206c42 SHA256 371b17be87f3c077bd4ebfdc7a62b39c216a69ff8f986d4a658d492076ab4100
+AUX 0001-Gentoo-specific-customizations.patch 1508 RMD160 ea3ca11470a4f504c84a9b68a059ecc458eef9e8 SHA1 437c7767000e3bc174ab122d954700187ca2b23a SHA256 b95cb7cb6be7f2a9ee42e45f77c851c3bdc50e0c3d34e2ebd706d50ba1cc60e7
 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-r2.ebuild 1897 RMD160 66bf9649cebcd9dd06bcf20b8973394ddc23c916 SHA1 2c683d2eb848b9ce124bd85d329f13f927fcb9c2 SHA256 a58432fdf66d0759584e4f459acac8315724f835c61c83d2185690904e5c0de5
-MISC ChangeLog 26783 RMD160 77e21cbb1ec00ecb0cf5915c44bd8b60fb1c5972 SHA1 951801010681e0b87cd89257d3aef74b34006aea SHA256 05ea5defceb81168d8824a6e7d673b83d2ed05c35c1e6f26122e19aafda846a4
+EBUILD xinit-1.2.0-r3.ebuild 1897 RMD160 61a7d331f132013e6e40a6aebc4290ec127b1bc5 SHA1 4cbf226c2a9bca58217b847fc81f798a7fb606a5 SHA256 53d2137f5e96efa743fa8f850d78de7e723205ff136fafd63f0f822b3aed4bc3
+MISC ChangeLog 27004 RMD160 853b6c94c283ed3b881d16dd169a4d356fbd21cb SHA1 5a5a0dd487fe18e2105f5a4c408facff6eb6b687 SHA256 b632fa1d143d5c1ad5be63d899c77930eb2fd3f616aac74b9ec0bdc9f3e88e52
 MISC metadata.xml 423 RMD160 c876450af2ac21f578380b4451185eb319d80d0e SHA1 44d53f0b7ffba06392eea95e72e3e000ebf45ad8 SHA256 fc28c674a857c63b7effbe9c7f186b56ec30cd7b5dabf814545d605cf4ab7817
diff --git a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch
index 6148de03353b..dc972a70a029 100644
--- a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch
+++ b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch
@@ -1,6 +1,6 @@
-From 57ce122fe4092fa3bffbd61b04ab69ef32426920 Mon Sep 17 00:00:00 2001
+From 4f039767273b60f9a1a24867db0988d46abe5972 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sat, 28 Nov 2009 22:14:17 +0100
+Date: Tue, 8 Dec 2009 15:22:13 +0100
 Subject: [PATCH] Gentoo-specific customizations
 
 ---
@@ -8,7 +8,7 @@ Subject: [PATCH] Gentoo-specific customizations
  1 files changed, 17 insertions(+), 12 deletions(-)
 
 diff --git a/xinitrc.cpp b/xinitrc.cpp
-index 379b1f3..b6186df 100644
+index 379b1f3..159f294 100644
 --- a/xinitrc.cpp
 +++ b/xinitrc.cpp
 @@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
@@ -48,7 +48,7 @@ index 379b1f3..b6186df 100644
 -XTERM -geometry 80x50+494+51 &
 -XTERM -geometry 80x20+494-0 &
 -exec XTERM -geometry 80x66+0+0 -name login
-+if [ $failsafe = "yes" ]; then
++if [ -n "$failsafe" ]; then
 +	TWM &
 +	XCLOCK -geometry 50x50-1+1 &
 +	XTERM -geometry 80x50+494+51 &
@@ -58,5 +58,5 @@ index 379b1f3..b6186df 100644
 +	exec $command
 +fi
 -- 
-1.6.5.3
+1.6.5.5
 
diff --git a/x11-apps/xinit/xinit-1.2.0-r2.ebuild b/x11-apps/xinit/xinit-1.2.0-r3.ebuild
index 9b819c68633d..521a9760ea20 100644
--- a/x11-apps/xinit/xinit-1.2.0-r2.ebuild
+++ b/x11-apps/xinit/xinit-1.2.0-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.2.0-r2.ebuild,v 1.1 2009/11/28 21:37:04 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.0-r3.ebuild,v 1.1 2009/12/08 22:14:12 remi Exp $
 
 EAPI="2"