[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/, x11-apps/xinit/

2022-12-03 Thread Matt Turner 
commit: c8ac6fe036ab10a805799c42464b3f0af6d60e2c
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Dec  3 23:31:02 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Dec  3 23:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8ac6fe0

x11-apps/xinit: Version bump to 1.4.2

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/Manifest|  1 +
 .../xinit-1.4.2-move-serverauthfile-into-tmp.patch | 23 +++
 .../files/xinit-1.4.2-startx-current-vt.patch  | 25 +++
 x11-apps/xinit/xinit-1.4.2.ebuild  | 76 ++
 4 files changed, 125 insertions(+)

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index ede67dd74923..a743e32e2550 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1 +1,2 @@
 DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 
1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a
 SHA512 
6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
+DIST xinit-1.4.2.tar.xz 156728 BLAKE2B 
8f5c16d5ec9cc16c734b1661def4f7e68321259f24e7aac2b039b8e142fb4a324d2471a0f04d3b4448ae713082ad9ec7018083b00ed1a93aac90fa7db172247d
 SHA512 
4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0

diff --git 
a/x11-apps/xinit/files/xinit-1.4.2-move-serverauthfile-into-tmp.patch 
b/x11-apps/xinit/files/xinit-1.4.2-move-serverauthfile-into-tmp.patch
new file mode 100644
index ..22b733fbdbba
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.4.2-move-serverauthfile-into-tmp.patch
@@ -0,0 +1,23 @@
+Move startx auth files in /tmp so they are removed on reboot.
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/startx.cpp b/startx.cpp
+index 082f780..9f9ff00 100644
+--- a/startx.cpp
 b/startx.cpp
+@@ -261,7 +261,7 @@ if [ x"$enable_xauth" = x1 ] ; then
+ dummy=0
+ 
+ XCOMM create a file with auth information for the server. ':0' is a dummy.
+-xserverauthfile=$HOME/.serverauth.$$
++xserverauthfile=`mktemp --tmpdir serverauth.XX`
+ trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM
+ xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
+-- 
+2.37.4
+

diff --git a/x11-apps/xinit/files/xinit-1.4.2-startx-current-vt.patch 
b/x11-apps/xinit/files/xinit-1.4.2-startx-current-vt.patch
new file mode 100644
index ..979d5260a13f
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.4.2-startx-current-vt.patch
@@ -0,0 +1,25 @@
+diff --git a/startx.cpp b/startx.cpp
+index dfbebe1..082f780 100644
+--- a/startx.cpp
 b/startx.cpp
+@@ -202,17 +202,6 @@ XCOMM process server arguments
+ if [ x"$server" = x ]; then
+ server=$defaultserver
+ 
+-#ifdef __linux__
+-XCOMM When starting the defaultserver start X on the current tty to avoid
+-XCOMM the startx session being seen as inactive:
+-XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491";
+-tty=$(tty)
+-if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
+-tty_num=${tty#/dev/tty}
+-vtarg="vt$tty_num -keeptty"
+-fi
+-#endif
+-
+ XCOMM For compatibility reasons, only use xserverrc if there were no 
server command line arguments
+ if [ x"$serverargs" = x -a x"$display" = x ]; then
+   if [ -f "$userserverrc" ]; then
+-- 
+2.37.4
+

diff --git a/x11-apps/xinit/xinit-1.4.2.ebuild 
b/x11-apps/xinit/xinit-1.4.2.ebuild
new file mode 100644
index ..73e5d99f7ffb
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~arm-linux ~x86-linux"
+IUSE="twm"
+
+RDEPEND="
+   x11-apps/xauth
+   x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+   twm? (
+   x11-apps/xclock
+   x11-apps/xsm
+   x11-terms/xterm
+   x11-wm/twm
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+   "${FILESDIR}/${PN}-1.4.2-startx-current-vt.patch"
+   "${FILESDIR}/${PN}-1.4.2-move-serverauthfile-into-tmp.patch"
+)
+
+XORG_CONFIGURE_OPTIONS=(
+   --with-xinitdir="${EPREFIX}"/etc/X11/xinit
+)
+
+src_install() {
+   xorg-3_src_install
+
+   exeinto /etc/X11
+   doexe "${FILESDIR}"/chooser.sh
+   exeinto /etc/X11/Sessions
+   doexe "${FILESDIR}"/Xsession
+   exeinto /etc/X11/xinit
+

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

2021-12-12 Thread Matt Turner 
commit: 89bd37128eb6bb0142b3e62288dc9c73b3259aed
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Dec 12 13:26:52 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Dec 12 14:18:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89bd3712

x11-apps/xinit: remove unused file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/23268
Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/files/startDM.sh | 31 ---
 1 file changed, 31 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
deleted file mode 100644
index 640bb24b7a26..
--- a/x11-apps/xinit/files/startDM.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# We need to source /etc/profile for stuff like $LANG to work
-# bug #10190.
-. /etc/profile
-
-. /lib/rc/sh/functions.sh
-
-# Bail out early if on a non-OpenRC system:
-if [ ! -d /run/openrc ]; then
-   eerror "$0 should only be used on OpenRC systems"
-fi
-
-# baselayout-1 compat
-if ! type get_options >/dev/null 2>/dev/null ; then
-   [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
-fi
-
-export RC_SVCNAME=xdm
-EXEC="$(get_options service)"
-NAME="$(get_options name)"
-PIDFILE="$(get_options pidfile)"
-START_STOP_ARGS="$(get_options start_stop_args)"
-
-start-stop-daemon --start --exec ${EXEC} \
-${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || 
\
-eerror "ERROR: could not start the Display Manager"
-
-# vim:ts=4

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/, x11-apps/xinit/

2019-05-15 Thread Matt Turner 
commit: 244cc8e97a0e43856f503046359b8bd8372dc34b
Author: Matt Turner  gentoo  org>
AuthorDate: Wed May 15 18:39:18 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 15 18:51:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244cc8e9

x11-apps/xinit: Don't use deprecated /etc/init.d/functions.sh

Closes: https://bugs.gentoo.org/504140
Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/files/startDM.sh   | 9 +++--
 x11-apps/xinit/files/{startDM.sh => startDM.sh.1} | 0
 x11-apps/xinit/xinit-1.4.0-r1.ebuild  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index e2da6098d6a..a4bf30e31ba 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
 . /etc/profile
 
-. /etc/init.d/functions.sh
+. /lib/rc/sh/functions.sh
+
+# Bail out early if on a non-OpenRC system:
+if [ ! -d /run/openrc ]; then
+   eerror "$0 should only be used on OpenRC systems"
+fi
 
 # baselayout-1 compat
 if ! type get_options >/dev/null 2>/dev/null ; then

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh.1
similarity index 100%
copy from x11-apps/xinit/files/startDM.sh
copy to x11-apps/xinit/files/startDM.sh.1

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index f8dedbb1ce7..be9e7a84a64 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -42,7 +42,7 @@ src_install() {
xorg-2_src_install
 
exeinto /etc/X11
-   doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+   doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh.1
exeinto /etc/X11/Sessions
doexe "${FILESDIR}"/Xsession
exeinto /etc/X11/xinit

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/, x11-apps/xinit/

2019-05-15 Thread Matt Turner 
commit: 491cd4d5509dd2f6866a5aaa6184c68915eb9652
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar  3 22:34:37 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 15 18:51:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491cd4d5

x11-apps/xinit: Version bump to 1.4.1

Use a patch from Debian to resolve bug 379441.

Closes: https://bugs.gentoo.org/379441
Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/Manifest|  1 +
 .../xinit-1.4.1-move-serverauthfile-into-tmp.patch | 22 +++
 x11-apps/xinit/xinit-1.4.1.ebuild  | 76 ++
 3 files changed, 99 insertions(+)

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 396082655b1..8b2e86bb882 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1 +1,2 @@
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 
5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081
 SHA512 
53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
+DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 
1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a
 SHA512 
6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340

diff --git 
a/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch 
b/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch
new file mode 100644
index 000..339b6531171
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch
@@ -0,0 +1,22 @@
+Move startx auth files in /tmp so they are removed on reboot.
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/startx.cpp
 b/startx.cpp
+@@ -278,11 +278,11 @@ if [ x"$enable_xauth" = x1 ] ; then
+ exit 1
+ fi
+ dummy=0
+ 
+ XCOMM create a file with auth information for the server. ':0' is a dummy.
+-xserverauthfile=$HOME/.serverauth.$$
++xserverauthfile=`mktemp --tmpdir serverauth.XX`
+ trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
+ xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
+ EOF
+ #if defined(__APPLE__) || defined(__CYGWIN__)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
new file mode 100644
index 000..4c26bd5588c
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal"
+
+RDEPEND="
+   ! /etc/env.d/90xsession"
+   ewarn "env-update && source /etc/profile"
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-1.4.1"; then
+   ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files 
are no longer kept in the"
+   ewarn "home directory but rather are created in \$TMPDIR 
(typically /tmp).  The change"
+   ewarn "is transparent for most of users, however those that use 
runtime temporary"
+   ewarn "directories cleaning tools, like app-admin/tmpreaper, 
may need to adjust them"
+   ewarn "not to remove the 'serverauth.*' files."
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

2019-05-15 Thread Matt Turner 
commit: 3ba45433f1a974b4fb6a37c3099cc731a445de8f
Author: Matt Turner  gentoo  org>
AuthorDate: Wed May 15 18:41:10 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 15 18:51:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba45433

x11-apps/xinit: Drop long-dead GTK envar

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/files/startDM.sh | 4 
 1 file changed, 4 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index a4bf30e31ba..640bb24b7a2 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -18,10 +18,6 @@ if ! type get_options >/dev/null 2>/dev/null ; then
[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
 fi
 
-# Great new Gnome2 feature, AA
-# We enable this by default
-export GDK_USE_XFT=1
-
 export RC_SVCNAME=xdm
 EXEC="$(get_options service)"
 NAME="$(get_options name)"

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

2019-02-28 Thread Matt Turner 
commit: 9ad67a504fa8619fff2d6c223b5fe7a288c4d5b3
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Feb 28 17:50:26 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Feb 28 17:50:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad67a50

x11-apps/xinit: s/SVCNAME/RC_SVCNAME/

Closes: https://bugs.gentoo.org/313287
Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/files/startDM.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 66cceb3a68f..e2da6098d6a 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -17,7 +17,7 @@ fi
 # We enable this by default
 export GDK_USE_XFT=1
 
-export SVCNAME=xdm
+export RC_SVCNAME=xdm
 EXEC="$(get_options service)"
 NAME="$(get_options name)"
 PIDFILE="$(get_options pidfile)"

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/, x11-apps/xinit/

2019-01-31 Thread Matt Turner 
commit: cefe728d56663e1a16263a29ec3c1bed8953c70c
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Jan 31 18:09:29 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Jan 31 18:11:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cefe728d

x11-apps/xinit: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/files/xserverrc.1  |  6 
 x11-apps/xinit/xinit-1.4.0.ebuild | 67 ---
 2 files changed, 73 deletions(-)

diff --git a/x11-apps/xinit/files/xserverrc.1 b/x11-apps/xinit/files/xserverrc.1
deleted file mode 100644
index 6b57eeba6da..000
--- a/x11-apps/xinit/files/xserverrc.1
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
deleted file mode 100644
index bc9cc6ade50..000
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+minimal"
-
-RDEPEND="
-   ! /etc/env.d/90xsession"
-   ewarn "env-update && source /etc/profile"
-}

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

2018-05-20 Thread Matt Turner 
commit: 66cb52db08b0d4223ccaed443077d4c5eff525b7
Author: Matt Turner  gentoo  org>
AuthorDate: Mon May 21 03:56:23 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon May 21 03:58:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cb52db

x11-apps/xinit: Restore necessary patch

Accidentally removed in e773ede4cc6c (x11-apps/xinit: Drop old versions)

 .../files/xinit-1.3.3-gentoo-customizations.patch  | 61 ++
 1 file changed, 61 insertions(+)

diff --git a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch 
b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
new file mode 100644
index 000..48dceabc500
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
@@ -0,0 +1,61 @@
+From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal 
+Date: Mon, 1 Nov 2010 16:46:36 +0100
+Subject: [PATCH] Gentoo customizations.
+
+
+Signed-off-by: Tomas Chvatal 
+---
+ xinitrc.cpp |   26 ++
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/xinitrc.cpp b/xinitrc.cpp
+index 049a8e4..80c3ad9 100644
+--- a/xinitrc.cpp
 b/xinitrc.cpp
+@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
+ 
+ userresources=$HOME/.Xresources
+ usermodmap=$HOME/.Xmodmap
+-sysresources=XINITDIR/.Xresources
+-sysmodmap=XINITDIR/.Xmodmap
++sysresources=XINITDIR/Xresources
++sysmodmap=XINITDIR/Xmodmap
+ 
+ XCOMM merge in defaults and keymaps
+ 
+@@ -84,15 +84,25 @@ fi
+ XCOMM This is the fallback case if nothing else is executed above
+ #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
+ 
++if [ -n "`/etc/X11/chooser.sh`" ]; then
++  command="`/etc/X11/chooser.sh`"
++else
++  failsafe="yes"
++fi
++
+ if [ -d XINITDIR/xinitrc.d ] ; then
+-  for f in XINITDIR/xinitrc.d/?*.sh ; do
++  for f in XINITDIR/xinitrc.d/?* ; do
+   [ -x "$f" ] && . "$f"
+   done
+   unset f
+ fi
+ 
+-TWM &
+-XCLOCK -geometry 50x50-1+1 &
+-XTERM -geometry 80x50+494+51 &
+-XTERM -geometry 80x20+494-0 &
+-exec XTERM -geometry 80x66+0+0 -name login
++if [ -n "$failsafe" ]; then
++  TWM &
++  XCLOCK -geometry 50x50-1+1 &
++  XTERM -geometry 80x50+494+51 &
++  XTERM -geometry 80x20+494-0 &
++  exec XTERM -geometry 80x66+0+0 -name login
++else
++  exec $command
++fi
+-- 
+1.7.3.1
+

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/, x11-apps/xinit/

2018-05-20 Thread Matt Turner 
commit: e773ede4cc6c0be8cdee43a07cbd64133c52ecfa
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May 20 18:28:46 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun May 20 18:28:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e773ede4

x11-apps/xinit: Drop old versions

 x11-apps/xinit/Manifest|  1 -
 .../files/xinit-1.3.3-gentoo-customizations.patch  | 61 --
 .../files/xinit-1.3.4-startx-current-vt.patch  | 21 --
 x11-apps/xinit/files/xserverrc |  2 -
 x11-apps/xinit/xinit-1.3.4-r3.ebuild   | 74 --
 x11-apps/xinit/xinit-1.3.4-r4.ebuild   | 67 
 6 files changed, 226 deletions(-)

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index c8a83bfc0c5..396082655b1 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,2 +1 @@
-DIST xinit-1.3.4.tar.bz2 165881 BLAKE2B 
78e0b9e8fdb146e969014d726ac05e7f4cf14947aa6026642fbbe6a55eb9c5cb891f079281bb40b460f9b1373259e338dcc0615fbdda64da49b719980017b782
 SHA512 
ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 
5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081
 SHA512 
53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e

diff --git a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch 
b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
deleted file mode 100644
index 48dceabc500..000
--- a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal 
-Date: Mon, 1 Nov 2010 16:46:36 +0100
-Subject: [PATCH] Gentoo customizations.
-
-
-Signed-off-by: Tomas Chvatal 

- xinitrc.cpp |   26 ++
- 1 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/xinitrc.cpp b/xinitrc.cpp
-index 049a8e4..80c3ad9 100644
 a/xinitrc.cpp
-+++ b/xinitrc.cpp
-@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
- 
- userresources=$HOME/.Xresources
- usermodmap=$HOME/.Xmodmap
--sysresources=XINITDIR/.Xresources
--sysmodmap=XINITDIR/.Xmodmap
-+sysresources=XINITDIR/Xresources
-+sysmodmap=XINITDIR/Xmodmap
- 
- XCOMM merge in defaults and keymaps
- 
-@@ -84,15 +84,25 @@ fi
- XCOMM This is the fallback case if nothing else is executed above
- #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
- 
-+if [ -n "`/etc/X11/chooser.sh`" ]; then
-+  command="`/etc/X11/chooser.sh`"
-+else
-+  failsafe="yes"
-+fi
-+
- if [ -d XINITDIR/xinitrc.d ] ; then
--  for f in XINITDIR/xinitrc.d/?*.sh ; do
-+  for f in XINITDIR/xinitrc.d/?* ; do
-   [ -x "$f" ] && . "$f"
-   done
-   unset f
- fi
- 
--TWM &
--XCLOCK -geometry 50x50-1+1 &
--XTERM -geometry 80x50+494+51 &
--XTERM -geometry 80x20+494-0 &
--exec XTERM -geometry 80x66+0+0 -name login
-+if [ -n "$failsafe" ]; then
-+  TWM &
-+  XCLOCK -geometry 50x50-1+1 &
-+  XTERM -geometry 80x50+494+51 &
-+  XTERM -geometry 80x20+494-0 &
-+  exec XTERM -geometry 80x66+0+0 -name login
-+else
-+  exec $command
-+fi
--- 
-1.7.3.1
-

diff --git a/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch 
b/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
deleted file mode 100644
index 362b420cfc8..000
--- a/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/startx.cpp b/startx.cpp
 a/startx.cpp   2014-09-11 19:31:42.0 +0200
-+++ b/startx.cpp   2015-02-08 19:09:56.416428623 +0100
-@@ -188,17 +188,6 @@
- if [ x"$server" = x ]; then
- server=$defaultserver
- 
--#ifdef __linux__
--XCOMM When starting the defaultserver start X on the current tty to avoid
--XCOMM the startx session being seen as inactive:
--XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491";
--tty=$(tty)
--if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
--tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
--vtarg="vt$tty_num"
--fi
--#endif
--
- XCOMM For compatibility reasons, only use xserverrc if there were no 
server command line arguments
- if [ x"$serverargs" = x -a x"$display" = x ]; then
-   if [ -f "$userserverrc" ]; then

diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc
deleted file mode 100644
index b4de2528749..000
--- a/x11-apps/xinit/files/xserverrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"

diff --git a/x11-apps/xinit/xinit-1.3.4-r3.ebuild 
b/x11-apps/xinit/xinit-1.3.4-r3.ebuild
deleted file mode 100644
index 9cca45f0328..000
--- a/x11-apps/xinit/xinit-1.

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

2017-10-19 Thread Matt Turner 
commit: dd42e7509a42d4bd8f139a7910eb519d939924f4
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct 19 16:05:31 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct 19 16:05:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd42e750

Revert "x11-apps/xinit: use /lib/gentoo/functions.sh instead of deprecated 
/etc/init.d/functions.sh"

This reverts commit 2bb6b9e50bdb8efc9a4627e60a4e63d38e8d6255.

Gentoo-Bug: https://bugs.gentoo.org/634706

 x11-apps/xinit/files/startDM.sh | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 21fb452df1e..66cceb3a68f 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,17 +1,12 @@
 #!/bin/sh
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
 . /etc/profile
 
-. /lib/gentoo/functions.sh
-
-# Bail out early if on a non-OpenRC system:
-if [ ! -d /run/openrc ]; then
-eerror "$0 should only be used on OpenRC systems"
-fi
+. /etc/init.d/functions.sh
 
 # baselayout-1 compat
 if ! type get_options >/dev/null 2>/dev/null ; then

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

2017-10-18 Thread Austin English 
commit: 2bb6b9e50bdb8efc9a4627e60a4e63d38e8d6255
Author: Austin English  gentoo  org>
AuthorDate: Wed Oct 18 21:41:12 2017 +
Commit: Austin English  gentoo  org>
CommitDate: Wed Oct 18 21:47:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb6b9e5

x11-apps/xinit: use /lib/gentoo/functions.sh instead of deprecated 
/etc/init.d/functions.sh

Also bail out early if the machine is not running OpenRC, with an
appropriate error

Acked-By: Manuel Rüger  gentoo.org>

Gentoo-Bug: https://bugs.gentoo.org/504140
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 x11-apps/xinit/files/startDM.sh | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 66cceb3a68f..21fb452df1e 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
 . /etc/profile
 
-. /etc/init.d/functions.sh
+. /lib/gentoo/functions.sh
+
+# Bail out early if on a non-OpenRC system:
+if [ ! -d /run/openrc ]; then
+eerror "$0 should only be used on OpenRC systems"
+fi
 
 # baselayout-1 compat
 if ! type get_options >/dev/null 2>/dev/null ; then

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

2017-02-17 Thread Matt Turner 
commit: cc79c7e2d44b7ded89e01024cb48a960095550ae
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 17 16:30:37 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Feb 17 17:16:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc79c7e2

x11-apps/xinit: remove unused patch

 .../xinit/files/0001-Gentoo-customizations.patch   | 61 --
 1 file changed, 61 deletions(-)

diff --git a/x11-apps/xinit/files/0001-Gentoo-customizations.patch 
b/x11-apps/xinit/files/0001-Gentoo-customizations.patch
deleted file mode 100644
index a25ef4ba2a..00
--- a/x11-apps/xinit/files/0001-Gentoo-customizations.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal 
-Date: Mon, 1 Nov 2010 16:46:36 +0100
-Subject: [PATCH] Gentoo customizations.
-
-
-Signed-off-by: Tomas Chvatal 

- xinitrc.cpp |   26 ++
- 1 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/xinitrc.cpp b/xinitrc.cpp
-index 049a8e4..80c3ad9 100644
 a/xinitrc.cpp
-+++ b/xinitrc.cpp
-@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
- 
- userresources=$HOME/.Xresources
- usermodmap=$HOME/.Xmodmap
--sysresources=XINITDIR/.Xresources
--sysmodmap=XINITDIR/.Xmodmap
-+sysresources=XINITDIR/Xresources
-+sysmodmap=XINITDIR/Xmodmap
- 
- XCOMM merge in defaults and keymaps
- 
-@@ -84,15 +84,25 @@ fi
- XCOMM This is the fallback case if nothing else is executed above
- #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
- 
-+if [ -n "`/etc/X11/chooser.sh`" ]; then
-+  command="`/etc/X11/chooser.sh`"
-+else
-+  failsafe="yes"
-+fi
-+
- if [ -d XINITDIR/xinitrc.d ] ; then
--  for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
-+  for f in XINITDIR/xinitrc.dXSLASHGLOB ; do
-   [ -x "$f" ] && . "$f"
-   done
-   unset f
- fi
- 
--TWM &
--XCLOCK -geometry 50x50-1+1 &
--XTERM -geometry 80x50+494+51 &
--XTERM -geometry 80x20+494-0 &
--exec XTERM -geometry 80x66+0+0 -name login
-+if [ -n "$failsafe" ]; then
-+  TWM &
-+  XCLOCK -geometry 50x50-1+1 &
-+  XTERM -geometry 80x50+494+51 &
-+  XTERM -geometry 80x20+494-0 &
-+  exec XTERM -geometry 80x66+0+0 -name login
-+else
-+  exec $command
-+fi
--- 
-1.7.3.1
-