diff options
| author |   Sven Eden <sven.eden@gmx.de> | 2017-06-05 14:14:31 +0200 |
|---|---|---|
| committer | Sven Eden <sven.eden@gmx.de> | 2017-06-05 14:14:31 +0200 |
| commit | 6495c375e6d12c1f42fec5d8d07be05fcf305423 (patch) | |
| tree | c7bbebc8fca545d7ed2ae765c87737aeac8fb35d | |
| parent | sys-auth/pambase removed ; elogind support is in the tree now. (diff) | |
| download | seden-6495c375e6d12c1f42fec5d8d07be05fcf305423.tar.gz seden-6495c375e6d12c1f42fec5d8d07be05fcf305423.tar.bz2 seden-6495c375e6d12c1f42fec5d8d07be05fcf305423.zip | |
x11-apps/xinit-1.3.4-r3 : Cleaned up elogind integration
| -rw-r--r-- | x11-apps/xinit/files/chooser.sh | 1 | ||||
| -rw-r--r-- | x11-apps/xinit/files/startDM.sh | 1 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.3.4-r3.ebuild (renamed from x11-apps/xinit/xinit-1.3.4-r2.ebuild) | 11 |
3 files changed, 4 insertions, 9 deletions
diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh index 6d14a71..6cfc574 100644 --- a/x11-apps/xinit/files/chooser.sh +++ b/x11-apps/xinit/files/chooser.sh @@ -2,7 +2,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Id$ # Find a match for $XSESSION in /etc/X11/Sessions GENTOO_SESSION="" diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh index 0265659..66cceb3 100644 --- a/x11-apps/xinit/files/startDM.sh +++ b/x11-apps/xinit/files/startDM.sh @@ -1,7 +1,6 @@ #!/bin/sh # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Id$ # We need to source /etc/profile for stuff like $LANG to work # bug #10190. diff --git a/x11-apps/xinit/xinit-1.3.4-r2.ebuild b/x11-apps/xinit/xinit-1.3.4-r3.ebuild index 1d35b83..c7e4f12 100644 --- a/x11-apps/xinit/xinit-1.3.4-r2.ebuild +++ b/x11-apps/xinit/xinit-1.3.4-r3.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=5 @@ -9,12 +8,10 @@ inherit xorg-2 DESCRIPTION="X Window System initializer" LICENSE="${LICENSE} GPL-2" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="elogind +minimal systemd" -REQUIRED_USE="elogind? ( !systemd ) - systemd? ( !elogind ) -" +REQUIRED_USE="?? ( elogind systemd )" RDEPEND=" !<x11-base/xorg-server-1.8.0 @@ -37,7 +34,7 @@ PATCHES=( src_prepare() { # this patch breaks startx on non-systemd systems, bug #526802 - if use !systemd && use !elogind; then + if use !elogind && use !systemd; then PATCHES+=( "${FILESDIR}"/${PN}-1.3.4-startx-current-vt.patch ) fi xorg-2_src_prepare |