[gentoo-commits] gentoo-x86 commit in x11-apps/xinit: ChangeLog xinit-1.0.8-r6.ebuild xinit-1.0.8-r5.ebuild

[gentoo-commits] gentoo-x86 commit in x11-apps/xinit: ChangeLog xinit-1.0.8-r6.ebuild xinit-1.0.8-r5.ebuild

[William Hubbs (williamh)]

williamh    09/09/15 00:24:07

  Modified:             ChangeLog
  Added:                xinit-1.0.8-r6.ebuild
  Removed:              xinit-1.0.8-r5.ebuild
  Log:
  renamed x-setup to xdm-setup to avoid collission with livecd-tools and fixed a typo.
  (Portage version: 2.2_rc40/cvs/Linux i686)

Revision  Changes    Path
1.134                x11-apps/xinit/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?r1=1.133&r2=1.134

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ChangeLog	14 Sep 2009 16:19:02 -0000	1.133
+++ ChangeLog	15 Sep 2009 00:24:06 -0000	1.134
@@ -1,6 +1,12 @@
 # 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.133 2009/09/14 16:19:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.134 2009/09/15 00:24:06 williamh Exp $
+
+*xinit-1.0.8-r6 (15 Sep 2009)
+
+  15 Sep 2009; William Hubbs <williamh@gentoo.org> -files/x-setup.initd-1,
+  +files/xdm-setup.initd-1, -xinit-1.0.8-r5.ebuild, +xinit-1.0.8-r6.ebuild:
+  Fixed a typo in x-setup and renamed it to xdm-setup.
 
 *xinit-1.0.8-r5 (14 Sep 2009)
 



1.1                  x11-apps/xinit/xinit-1.0.8-r6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r6.ebuild?rev=1.1&content-type=text/plain

Index: xinit-1.0.8-r6.ebuild
===================================================================
# 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-r6.ebuild,v 1.1 2009/09/15 00:24:06 williamh 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="hal minimal pam"

RDEPEND="x11-apps/xauth
	x11-libs/libX11
	hal? ( sys-auth/consolekit sys-apps/dbus[X] )"
DEPEND="${RDEPEND}"
PDEPEND="!minimal? ( x11-wm/twm
				x11-apps/xclock
				x11-apps/xrdb
				x11-apps/xsm
				x11-terms/xterm )"

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 hal 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"
}