Version bump.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 79 insertions, 13 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index e9b3be5c7122..a3e0d3d2a24a 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xinit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.223 2011/12/27 20:55:01 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.224 2012/01/31 21:28:16 chithanh Exp $
+
+*xinit-1.3.2 (31 Jan 2012)
+
+  31 Jan 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xinit-1.3.2.ebuild:
+  Version bump.
 
   27 Dec 2011; Markus Meier <maekke@gentoo.org> xinit-1.3.1-r1.ebuild:
   x86 stable, bug #394393
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 22593b03e4cf..df3ac1721971 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02629cd14f5f5fa8a56ec9421e0dc46b SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97
 AUX 0001-Gentoo-customizations.patch 1508 RMD160 8af271ddcaf20e588baaf6e8477e4354fa2ea0f8 SHA1 a538ef116aad391163853aa04586622515dc7c0d SHA256 3b43514ca65c882def485497917c67e64c570fa0c1ef8d758bd949d41e0f9a9c
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
@@ -11,15 +8,10 @@ AUX xinit-1.3.1-prio-process.patch 357 RMD160 212206c365f6a0c501336670f12c36cb42
 AUX xserverrc 45 RMD160 ba59828df58de185ac8cbe762f746cc4b5b25594 SHA1 297121e4f3bc8abbaade83cd2583d16e8887e15b SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387
 DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
 DIST xinit-1.3.1.tar.bz2 147067 RMD160 aadb0729c65438819cfaae4733f512574fa39c2d SHA1 6d3981c23ce49212a26912651d6d2473a5065766 SHA256 c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0
+DIST xinit-1.3.2.tar.bz2 148443 RMD160 097cd409e829255c328d1d87d69fb8206482f5d5 SHA1 1c287ac016d277f973652fa3707eef6db8353d5a SHA256 a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235
 EBUILD xinit-1.3.0-r2.ebuild 1670 RMD160 6747e0a03a2228f5d42bab22a7265d77f8f5c8b8 SHA1 0ce712851536ceafc53355031e3b0c95984d8186 SHA256 6477c0a8deac0067f54ed00ebe3a6d13d0e10b99276b6a0673390017f9e3b38c
 EBUILD xinit-1.3.1-r1.ebuild 1785 RMD160 6d12aae7be4960972d8510fb5d6ac22bea7cc896 SHA1 7508b1a28902f82c8158eb3f645d3bf1bfb8e92e SHA256 cbeee4e9a08b154fe0bda00b08b2604e742bf227b61c93a9909f2eedb99a3222
 EBUILD xinit-1.3.1.ebuild 1706 RMD160 1442cc9c1965d73c86eebe54ee8f06c36f6b97c4 SHA1 a53077a4863b3de4db44762420ea0b078027f6f7 SHA256 3b1eb7bd90904ce81772cb231aa84307abd6c54906ab27d49a25a1a27614d4be
-MISC ChangeLog 34112 RMD160 a2a8f5ea5d9e8999783c1e68eb89d2765360354b SHA1 7fc78585f08f13295d6723b1f132b5d72b614a15 SHA256 a411302176017edd9a7d68eec71ea76adf680b6da1afe4351ba145799b5022c2
+EBUILD xinit-1.3.2.ebuild 1749 RMD160 64965b97a5594a72d43b0d967648b0494056200b SHA1 62ec97b73a8b2f5c050dec979fbcb015a4f7f34a SHA256 9c22689ee422148f6c0cb92d86644fe3396d640d88cb4d36c151032ef0ff2cc5
+MISC ChangeLog 34251 RMD160 962c8a9dc5cdd6ee7df90a8b373133a50fc56ff9 SHA1 2a9fe19a9dc04c180b13d02c4c058677ef7fd2e6 SHA256 2833e838da79a4978df40dd8d147c6844228190d118146e554714c8a47c09f3c
 MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk76MRcACgkQkKaRLQcq0GI75ACghvORDxrVzy9JQOSEwRoOg8LD
-ZGIAnihuGHEhdGiKUR6lawb9XbNCdUrk
-=O1xe
------END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/xinit-1.3.2.ebuild b/x11-apps/xinit/xinit-1.3.2.ebuild
new file mode 100644
index 000000000000..57a7f56c3eb1
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.2.ebuild,v 1.1 2012/01/31 21:28:16 chithanh Exp $
+
+EAPI=4
+
+inherit xorg-2
+
+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-base/xorg-server-1.8.0
+	x11-apps/xauth
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+	!minimal? (
+		x11-apps/xclock
+		x11-apps/xsm
+		x11-terms/xterm
+		x11-wm/twm
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/0001-Gentoo-customizations.patch"
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xinitdir=/etc/X11/xinit
+	)
+}
+
+src_install() {
+	xorg-2_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}"/xserverrc
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/00-xhost"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/Xsession.desktop"
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+	ewarn "any executable. When you run startx, it will run this as the login session."
+	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+	ewarn "Here's an example of setting it for the whole system:"
+	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+	ewarn "    env-update && source /etc/profile"
+}