[x11-apps/xinit] Sync with main tree.

4 files changed, 22 insertions, 34 deletions

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index b93dff2f..cff1da8f 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02629cd14f5f5fa8a56ec9421e0dc46b SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97
-AUX 0001-Gentoo-specific-customizations-r1.patch 1476 RMD160 9168172406dd84e94229dafa3ac320b10e1349e0 SHA1 839224a56ce908c7a8a7f1a10924fc03e634aace SHA256 2fc0b500e71548cdeff42b84505e9493ed0fe8c94f403eacae95bb6310dbce34
+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 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212
 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549
-AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
 AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe
-EBUILD xinit-9999.ebuild 1654 RMD160 a6a1ba9ad8e0cba5592b8e6d671b4dd65a85d52f SHA1 82349f6e72b353870bad4231948fe62f40c8615b SHA256 29f2390a98ecc339b95b6677c79a904aaa557b1d9141a4b1c1ee8b36efd4a0ec
+EBUILD xinit-9999.ebuild 1689 RMD160 0f5775962c637dbbc377a1ce4b4eaf7906450fd1 SHA1 90958f7267430a153e480e058fffbba7b6f9c652 SHA256 e03d556fadbd43c77476cecce04c97631565873f0963a626aa0214c0db27dc3e
 MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkynZloACgkQnGSe5QXeB7tdfwCgxCao0c6URiuFLfRATmtlw/df
-wR0AoN8KgQ2P+q/73lM7vmupKTYtfN8L
-=Rkpg
------END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/files/0001-Gentoo-specific-customizations-r1.patch b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch
index 318f0f4a..dc972a70 100644
--- a/x11-apps/xinit/files/0001-Gentoo-specific-customizations-r1.patch
+++ b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch
@@ -1,14 +1,14 @@
-From a2d86ec291aabd2bafd3a2f52e22bac085de555d 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: Tue, 8 Dec 2009 15:22:13 +0100
 Subject: [PATCH] Gentoo-specific customizations
 
 ---
- xinitrc.cpp |   26 ++++++++++++++++++--------
- 1 files changed, 18 insertions(+), 8 deletions(-)
+ xinitrc.cpp |   29 +++++++++++++++++------------
+ 1 files changed, 17 insertions(+), 12 deletions(-)
 
 diff --git a/xinitrc.cpp b/xinitrc.cpp
-index 049a8e4..80c3ad9 100644
+index 379b1f3..159f294 100644
 --- a/xinitrc.cpp
 +++ b/xinitrc.cpp
 @@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
@@ -22,16 +22,17 @@ index 049a8e4..80c3ad9 100644
  
  XCOMM merge in defaults and keymaps
  
-@@ -84,15 +84,25 @@ fi
+@@ -84,19 +84,24 @@ fi
  XCOMM This is the fallback case if nothing else is executed above
  #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
  
+-#ifdef __APPLE__
 +if [ -n "`/etc/X11/chooser.sh`" ]; then
 +	command="`/etc/X11/chooser.sh`"
 +else
 +	failsafe="yes"
 +fi
-+
+ 
  if [ -d XINITDIR/xinitrc.d ] ; then
 -	for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
 +	for f in XINITDIR/xinitrc.dXSLASHGLOB ; do
@@ -39,7 +40,9 @@ index 049a8e4..80c3ad9 100644
  	done
  	unset f
  fi
- 
+-
+-#endif
+-
 -TWM &
 -XCLOCK -geometry 50x50-1+1 &
 -XTERM -geometry 80x50+494+51 &
@@ -55,5 +58,5 @@ index 049a8e4..80c3ad9 100644
 +	exec $command
 +fi
 -- 
-1.7.0.4
+1.6.5.5
 
diff --git a/x11-apps/xinit/files/xserver.pamd b/x11-apps/xinit/files/xserver.pamd
deleted file mode 100644
index b093f86a..00000000
--- a/x11-apps/xinit/files/xserver.pamd
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       sufficient   pam_rootok.so
-auth       required     pam_permit.so
-
-account    required     pam_permit.so
diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index 391fecf2..8e43d763 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.1-r2.ebuild,v 1.1 2010/05/27 08:42:59 scarabeus Exp $
 
 EAPI=3
-inherit xorg-2 pam
+
+inherit xorg-2
 
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+minimal pam"
+IUSE="+minimal"
 
 RDEPEND="
+	!<x11-base/xorg-server-1.8.0
 	x11-apps/xauth
-	>=x11-base/xorg-server-1.8.0-r1
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}"
-PDEPEND="!minimal? (
+PDEPEND="x11-apps/xrdb
+	!minimal? (
 		x11-apps/xclock
-		x11-apps/xrdb
 		x11-apps/xsm
 		x11-terms/xterm
 		x11-wm/twm
@@ -27,11 +28,12 @@ PDEPEND="!minimal? (
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-Gentoo-specific-customizations-r1.patch"
+	"${FILESDIR}/0001-Gentoo-customizations.patch"
 )
 
 pkg_setup() {
 	xorg-2_pkg_setup
+
 	CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
 }
 
@@ -44,7 +46,6 @@ src_install() {
 	doexe "${FILESDIR}"/Xsession || die
 	exeinto /etc/X11/xinit
 	doexe "${FILESDIR}"/xserverrc || die
-	newpamd "${FILESDIR}"/xserver.pamd xserver
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/00-xhost"
 }