Add xinit version that accomodates 1.8 release

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 74 insertions, 5 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 4c4d9345e99f..1aeab2a82a41 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.180 2010/03/17 15:41:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.181 2010/04/13 10:05:15 scarabeus Exp $
+
+*xinit-1.2.1-r1 (13 Apr 2010)
+
+  13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xinit-1.2.1-r1.ebuild:
+  Add xinit version that accomodates 1.8 release
 
 *xinit-1.2.1 (17 Mar 2010)
 
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 82163ff6edcd..ec9872f1cac1 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -14,13 +14,14 @@ AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfc
 DIST xinit-1.2.0.tar.bz2 136781 RMD160 c2895db985482c13ef300a037bf2e182aeda1442 SHA1 85a838c2010f27ef6d09d6ec4b1208a66cc8d697 SHA256 ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f
 DIST xinit-1.2.1.tar.bz2 141441 RMD160 993b068e4758521ed930bd78069c291b68d88037 SHA1 baf36374aa1632054816a8281e55e1539459664b SHA256 16bcc73ae81b6d80fd1a9419ea757f38870d1043d440b6d56fcaa79d4c6c9b07
 EBUILD xinit-1.2.0-r3.ebuild 1889 RMD160 120478ef87a845a1c614a219b66089873339b2fc SHA1 85e5f1304ab5bd87ce36455be440272c3f5d0f9b SHA256 7deb616d0216b3b1d1459d27e88dceeb04b0c57ceaa98f1c6099789200987734
+EBUILD xinit-1.2.1-r1.ebuild 1748 RMD160 baf1b7bc87a48bf2d4f821318f554f52f5cd4c4b SHA1 3532e04d2032a5861ccdc880a71bcf6103483f60 SHA256 832498c9d12579047ed45f0f199eda3360af2226fe4872701b7a8cae3b646ac1
 EBUILD xinit-1.2.1.ebuild 1899 RMD160 b49a4b99857d42a4ef36f094a57b9b36b01f12f1 SHA1 3f8cb624d93e1b8d8c02b34f735057853be3a410 SHA256 c0229e767336de217f765894ed0955e29e54023c5919cc3f197f26465202baab
-MISC ChangeLog 28409 RMD160 bfb3bc7ab2d4f1226cac7438385fccce103a1537 SHA1 9b2c32cb288636cce4f631504d8a297be2354117 SHA256 f16c00a2dc3799820bb4822eaa1517c279d7c76418ee4b3a78b4cf23f36b1b6a
+MISC ChangeLog 28571 RMD160 702f94959c9d14c605d5d0401b4a1a88a98baf5a SHA1 fed03a640d5d79888e475164663e95b52550c461 SHA256 e30e70a43b8d141e0de6d62789a57e6f654ad6b3c493e1dea377c04083b6dc34
 MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkug+AgACgkQHB6c3gNBRYfQ5wCeIsDm+I2TTazrzwF4DyFaHTeb
-el4AniKTpx9OgPaDeJL5RWtfQTFkGYTi
-=XdHH
+iEYEARECAAYFAkvEQdEACgkQHB6c3gNBRYcEAQCeJySPqgLHGw8KhIXpi8IE/Fcc
+7q8Anj6azVlQ7su2aul3HYDuRMaCdS+F
+=JDXl
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/xinit-1.2.1-r1.ebuild b/x11-apps/xinit/xinit-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..906bc4c33932
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.2.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.1-r1.ebuild,v 1.1 2010/04/13 10:05:15 scarabeus Exp $
+
+EAPI="2"
+
+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 pam"
+
+RDEPEND="
+	x11-apps/xauth
+	>=x11-base/xorg-server-1.8.0
+	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-specific-customizations.patch"
+)
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
+}
+
+src_install() {
+	x-modular_src_install
+
+	exeinto /etc/X11
+	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
+	exeinto /etc/X11/Sessions
+	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"
+}
+
+pkg_postinst() {
+	x-modular_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"
+}