diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-03-14 14:38:55 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-03-14 14:38:55 +0000 |
| commit | 3398874e684f8ed8f252562b758d0a6939d5148f (patch) | |
| tree | 293c814c5b6bb1320d72104698ab39017dac5bc2 /x11-apps | |
| parent | Fix one more parallel make issue (bug #362249). (diff) | |
| download | gentoo-2-3398874e684f8ed8f252562b758d0a6939d5148f.tar.gz gentoo-2-3398874e684f8ed8f252562b758d0a6939d5148f.tar.bz2 gentoo-2-3398874e684f8ed8f252562b758d0a6939d5148f.zip | |
Revert changes to stable packages, bug #451956.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xserverrc | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xserverrc.1 | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.3.3-r1.ebuild | 4 |
4 files changed, 14 insertions, 8 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 8f02394842e8..5e47ed6834ac 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.253 2014/03/14 12:34:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.254 2014/03/14 14:38:55 chithanh Exp $ + + 14 Mar 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xserverrc.1, files/xserverrc, xinit-1.3.3-r1.ebuild: + Revert changes to stable packages, bug #451956. *xinit-1.3.3-r1 (14 Mar 2014) diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc index 6b57eeba6da3..b4de2528749e 100644 --- a/x11-apps/xinit/files/xserverrc +++ b/x11-apps/xinit/files/xserverrc @@ -1,6 +1,2 @@ #!/bin/sh -if [ -z "$XDG_VTNR" ]; then - exec /usr/bin/X -nolisten tcp "$@" -else - exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR -fi +exec /usr/bin/X -nolisten tcp "$@" diff --git a/x11-apps/xinit/files/xserverrc.1 b/x11-apps/xinit/files/xserverrc.1 new file mode 100644 index 000000000000..6b57eeba6da3 --- /dev/null +++ b/x11-apps/xinit/files/xserverrc.1 @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -z "$XDG_VTNR" ]; then + exec /usr/bin/X -nolisten tcp "$@" +else + exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR +fi diff --git a/x11-apps/xinit/xinit-1.3.3-r1.ebuild b/x11-apps/xinit/xinit-1.3.3-r1.ebuild index 0427d2b6a8a3..229bf5dea049 100644 --- a/x11-apps/xinit/xinit-1.3.3-r1.ebuild +++ b/x11-apps/xinit/xinit-1.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.3-r1.ebuild,v 1.1 2014/03/14 12:34:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.3-r1.ebuild,v 1.2 2014/03/14 14:38:55 chithanh Exp $ EAPI=5 @@ -46,7 +46,7 @@ src_install() { exeinto /etc/X11/Sessions doexe "${FILESDIR}"/Xsession exeinto /etc/X11/xinit - doexe "${FILESDIR}"/xserverrc + newexe "${FILESDIR}"/xserverrc.1 xserverrc exeinto /etc/X11/xinit/xinitrc.d/ doexe "${FILESDIR}"/00-xhost |