Revbump the xinint for the last commit so automagicness is fixed even for those whom already compiled the thing.

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

3 files changed, 91 insertions, 5 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 8676c536930f..a81f56c6900c 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.138 2009/09/21 07:53:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.139 2009/09/21 08:00:33 scarabeus Exp $
+
+*xinit-1.0.8-r8 (21 Sep 2009)
+
+  21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xinit-1.0.8-r8.ebuild:
+  Revbump the xinint for the last commit so automagicness is fixed even for
+  those whom already compiled the thing.
 
   21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   xinit-1.0.8-r7.ebuild:
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 811dd9546443..621c7ef0329c 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -27,13 +27,14 @@ EBUILD xinit-1.0.8-r2.ebuild 1795 RMD160 5af656de1216810164bec4e7cfe27337bbe9db3
 EBUILD xinit-1.0.8-r3.ebuild 1924 RMD160 daea591250fc80d64032be5b32aa641375b91cde SHA1 8982722c65ddcd5f3ac2f39ec587e05c521e5b59 SHA256 2b3da814a3367dbd9b8a53cc61a71adea7b6778d58ac8955a7f31d71b73d5637
 EBUILD xinit-1.0.8-r4.ebuild 2146 RMD160 76cfb718bcfd7ab710a7e3bb609a42c60172654e SHA1 33f000c3b440b517e5a1d5c60e346e6af38874e6 SHA256 ff68cfbbd6f36428a7bfefa0d28e409bdf5492f2df1b309066e46f22543f7cd7
 EBUILD xinit-1.0.8-r7.ebuild 2282 RMD160 af442abba5f78d4208aa5e99e630384354ea80f0 SHA1 ee904a6ccaa3680331aae2b2238d430022c815ec SHA256 be7289008950fd658a10e59df310c9ba47b6e0d144d2ee8724781c5f53446ee5
+EBUILD xinit-1.0.8-r8.ebuild 2282 RMD160 afb76f954861166e70df74ee6a825eda8a020ca0 SHA1 5150863385c6089328ce6573c440edddf12f3d34 SHA256 02f295b75141d0882104b566dc954a0c40c0fdb20cc657c8199822d74296340b
 EBUILD xinit-1.0.8.ebuild 1743 RMD160 e69d30cd92810870fbb9bf4f0896778c4e162c30 SHA1 9704fa014525f1e45dddcc658d6d83990e21961a SHA256 8ed635360a4136209fe0249c53bd3254367957dec543a5f1a1f1b06fc8cefd63
-MISC ChangeLog 21982 RMD160 e2897c9443cd2a044fc12c38c29c347129636668 SHA1 0d752772a1e79c1e87dc7d70580515bee12a4720 SHA256 cc9fa8bbfa5078dbe03cb89cd44b71b1d35591331f43d79f9b267f7b5b279da1
+MISC ChangeLog 22212 RMD160 e7ba2c4845bba48f87bc9a8c96d3aa245a0b072d SHA1 f8756f95c9ae2c30cdf404a5e11cc7503b19cb0f SHA256 98cbafe479a6fd3b12a12ca45ff891d6c254b284605f9a971995138e29ef019c
 MISC metadata.xml 272 RMD160 d0b40c3604f1b076f4ea2ead421b7361de293dce SHA1 9105900f56ba880d256b70bce06dd1cb69b1d4e6 SHA256 0e394010bdee148e101784bb38e4b1cdb106da7e2e5a7fc4fde946c65d0e4f7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq3MT8ACgkQHB6c3gNBRYcKGwCeI/+8iRFTE3Te6YUo6nOW2eSD
-dooAn1mjdRfMlVE7zruu539S2xFKr2wX
-=nLu1
+iEYEARECAAYFAkq3MtUACgkQHB6c3gNBRYeO7wCgz9r1r5tbvf00Q35DNEvBqWDR
+kygAn0g1ppV+oToumY7uUtl4gpIhzuq1
+=Bmwt
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/xinit-1.0.8-r8.ebuild b/x11-apps/xinit/xinit-1.0.8-r8.ebuild
new file mode 100644
index 000000000000..88bcbbf0ace3
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.8-r8.ebuild
@@ -0,0 +1,78 @@
+# 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.0.8-r8.ebuild,v 1.1 2009/09/21 08:00:33 scarabeus Exp $
+
+EAPI="2"
+
+# Must be before x-modular eclass is inherited
+# This is enabled due to modified Makefile.am from the patches
+SNAPSHOT="yes"
+
+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="consolekit hal minimal pam"
+
+RDEPEND="
+	x11-apps/xauth
+	x11-libs/libX11
+	hal? ( sys-apps/hal sys-apps/dbus[X] )
+	consolekit? (
+		sys-auth/consolekit
+		hal? ( sys-apps/hal[consolekit] )
+	)
+"
+DEPEND="${RDEPEND}"
+PDEPEND="!minimal? (
+		x11-apps/xclock
+		x11-apps/xrdb
+		x11-apps/xsm
+		x11-terms/xterm
+		x11-wm/twm
+	)
+"
+
+PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
+	"${FILESDIR}"/gentoo-startx-customization-1.0.8.patch
+	"${FILESDIR}"/xinit-1.0.4-console-kit.patch )
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_with consolekit)"
+}
+
+src_prepare() {
+	x-modular_patch_source
+
+	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" "${S}/Makefile.am"
+
+	x-modular_reconf_source
+}
+
+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}"/xinitrc || die
+	newinitd "${FILESDIR}"/xdm.initd-3 xdm
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newconfd "${FILESDIR}"/xdm.confd-1 xdm
+	newpamd "${FILESDIR}"/xserver.pamd xserver
+}
+
+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"
+}