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

[Stephen Klimaszewski (steev)]

steev       07/09/10 18:42:06

  Modified:             ChangeLog
  Added:                xinit-1.0.5-r1.ebuild
  Log:
  Add a new revision to 1.0.5 with consolekit support. This is use.masked on s390 and x86-fbsd until we get consolekit working on those two.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.100                x11-apps/xinit/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog	10 Sep 2007 03:13:52 -0000	1.99
+++ ChangeLog	10 Sep 2007 18:42:06 -0000	1.100
@@ -1,6 +1,14 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.99 2007/09/10 03:13:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.100 2007/09/10 18:42:06 steev Exp $
+
+*xinit-1.0.5-r1 (10 Sep 2007)
+
+  10 Sep 2007; Steev Klimaszewski <steev@g.o>
+  +files/xinit-1.0.4-console-kit.patch, +xinit-1.0.5-r1.ebuild:
+  Add the patch from fdo bugzilla 12378 with useflag of hal rather than
+  consoleki, added as a revision bump to 1.0.5. This adds consolekit support
+  to xinit. Also requires dbus be build with the X useflag to properly work."
 
   10 Sep 2007; Jeroen Roovers <jer@g.o> xinit-1.0.4.ebuild:
   Stable for HPPA (bug #191615).



1.1                  x11-apps/xinit/xinit-1.0.5-r1.ebuild

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

Index: xinit-1.0.5-r1.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild,v 1.1 2007/09/10 18:42:06 steev Exp $

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

RDEPEND="x11-apps/xauth
	x11-libs/libX11
	hal? ( sys-auth/consolekit )"
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.4.patch
	${FILESDIR}/xinit-1.0.4-console-kit.patch"

CONFIGURE_OPTIONS="$(use_with hal consolekit)"

pkg_setup() {
	if ! built_with_use sys-apps/dbus X ; then
		eerror "You MUST build sys-apps/dbus with the X USE flag enabled."
		die "You MUST build sys-apps/dbus with the X USE flag enabled."
	fi
}

src_unpack() {
	x-modular_unpack_source
	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
	exeinto /etc/X11/Sessions
	doexe ${FILESDIR}/Xsession
	exeinto /etc/X11/xinit
	doexe ${FILESDIR}/xinitrc
	newinitd ${FILESDIR}/xdm.initd-1 xdm
	newconfd ${FILESDIR}/xdm.confd-1 xdm
	newpamd ${FILESDIR}/xserver.pamd xserver
}



-- 
gentoo-commits@g.o mailing list