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

[Matthias Schwarzott (zzam)]

zzam        08/05/06 08:16:56

  Modified:             ChangeLog
  Added:                xinit-1.0.8-r3.ebuild
  Log:
  Fix xdm init-script to be run after lircmd instead of just lircd to be able to use virtual lirc mouse device, Bug #180163.
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.116                x11-apps/xinit/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ChangeLog	9 Apr 2008 02:08:44 -0000	1.115
+++ ChangeLog	6 May 2008 08:16:56 -0000	1.116
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.115 2008/04/09 02:08:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.116 2008/05/06 08:16:56 zzam Exp $
+
+*xinit-1.0.8-r3 (06 May 2008)
+
+  06 May 2008; Matthias Schwarzott <zzam@g.o> +files/xdm.initd-2,
+  +xinit-1.0.8-r3.ebuild:
+  Fix xdm init-script to be run after lircmd instead of just lircd to be
+  able to use virtual lirc mouse device, Bug #180163.
 
 *xinit-1.0.8-r2 (09 Apr 2008)
 



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

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

Index: xinit-1.0.8-r3.ebuild
===================================================================
# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/05/06 08:16:56 zzam 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 pam"

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.8.patch
	${FILESDIR}/xinit-1.0.4-console-kit.patch"

CONFIGURE_OPTIONS="$(use_with hal consolekit)"

pkg_setup() {
	if use hal; then
		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
	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 || die
	exeinto /etc/X11/Sessions
	doexe "${FILESDIR}"/Xsession || die
	exeinto /etc/X11/xinit
	doexe "${FILESDIR}"/xinitrc || die
	newinitd "${FILESDIR}"/xdm.initd-2 xdm
	newconfd "${FILESDIR}"/xdm.confd-1 xdm
	newpamd "${FILESDIR}"/xserver.pamd xserver
	newenvd "${FILESDIR}"/xsession.env.d 90xsession
}



-- 
gentoo-commits@l.g.o mailing list