Version bump.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

3 files changed, 83 insertions, 2 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index cf8e695d8a76..4c4d9345e99f 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.179 2010/01/23 19:03:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.180 2010/03/17 15:41:39 scarabeus Exp $
+
+*xinit-1.2.1 (17 Mar 2010)
+
+  17 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org> +xinit-1.2.1.ebuild:
+  Version bump.
 
   23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> -files/xdm.confd-1,
   -files/xinit-1.0.4-console-kit.patch, -xinit-1.0.8-r10.ebuild,
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index b0edff74a2c3..82163ff6edcd 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02629cd14f5f5fa8a56ec9421e0dc46b SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97
 AUX 0001-Gentoo-specific-customizations.patch 1508 RMD160 ea3ca11470a4f504c84a9b68a059ecc458eef9e8 SHA1 437c7767000e3bc174ab122d954700187ca2b23a SHA256 b95cb7cb6be7f2a9ee42e45f77c851c3bdc50e0c3d34e2ebd706d50ba1cc60e7
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
@@ -9,6 +12,15 @@ AUX xdm.initd-4 6515 RMD160 3fcde7817879552b9cee0f09063116db8b8183a7 SHA1 fc4f56
 AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
 AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe
 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
-MISC ChangeLog 28288 RMD160 407f8855474b61572ca5fb89c9fdb847937b473c SHA1 292542b294ce653192690a183a531f93cee9f554 SHA256 e61852558143c1ad27917baee1aae7363533c8bfb2a6e42acd8db83fee0e66f0
+EBUILD xinit-1.2.1.ebuild 1899 RMD160 b49a4b99857d42a4ef36f094a57b9b36b01f12f1 SHA1 3f8cb624d93e1b8d8c02b34f735057853be3a410 SHA256 c0229e767336de217f765894ed0955e29e54023c5919cc3f197f26465202baab
+MISC ChangeLog 28409 RMD160 bfb3bc7ab2d4f1226cac7438385fccce103a1537 SHA1 9b2c32cb288636cce4f631504d8a297be2354117 SHA256 f16c00a2dc3799820bb4822eaa1517c279d7c76418ee4b3a78b4cf23f36b1b6a
 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
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/xinit-1.2.1.ebuild b/x11-apps/xinit/xinit-1.2.1.ebuild
new file mode 100644
index 000000000000..024aae4c0673
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.2.1.ebuild
@@ -0,0 +1,64 @@
+# 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.ebuild,v 1.1 2010/03/17 15:41:39 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-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
+	newinitd "${FILESDIR}"/xdm.initd-4 xdm || die
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
+	newconfd "${FILESDIR}"/xdm.confd-2 xdm || die
+	newpamd "${FILESDIR}"/xserver.pamd xserver
+	dodir /etc/X11/xinit/xinitrc.d
+	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"
+}