[gentoo-commits] gentoo-x86 commit in x11-apps/xinit: xinit-1.2.1-r2.ebuild ChangeLog xinit-1.2.1-r1.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    10/05/27 08:42:59

  Modified:             ChangeLog
  Added:                xinit-1.2.1-r2.ebuild
  Removed:              xinit-1.2.1-r1.ebuild
  Log:
  Update the deps on xorg-server to be rather blocker than dep. Drop s390 keyword since xorg-server we want dont have it.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.182                x11-apps/xinit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.182&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.182&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?r1=1.181&r2=1.182

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- ChangeLog	13 Apr 2010 10:05:15 -0000	1.181
+++ ChangeLog	27 May 2010 08:42:59 -0000	1.182
@@ -1,6 +1,13 @@
 # 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.181 2010/04/13 10:05:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.182 2010/05/27 08:42:59 scarabeus Exp $
+
+*xinit-1.2.1-r2 (27 May 2010)
+
+  27 May 2010; Tomáš Chvátal <scarabeus@g.o>
+  -xinit-1.2.1-r1.ebuild, +xinit-1.2.1-r2.ebuild:
+  Update the deps on xorg-server to be rather blocker than dep. Drop s390
+  keyword since xorg-server we want dont have it.
 
 *xinit-1.2.1-r1 (13 Apr 2010)
 



1.1                  x11-apps/xinit/xinit-1.2.1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/xinit-1.2.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/xinit-1.2.1-r2.ebuild?rev=1.1&content-type=text/plain

Index: xinit-1.2.1-r2.ebuild
===================================================================
# 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-r2.ebuild,v 1.1 2010/05/27 08:42:59 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 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="+minimal pam"

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