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

[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/

[WANG Xuerui]

commit: 0b168209688a2d259941d5c3597d4b4b533f6512
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun May  8 07:04:31 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun May  8 07:33:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b168209

x11-apps/xinit: keyword 1.4.1-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 6fe423adfb1a..d3ec2f7d9fa6 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[James Le Cuirot]

commit: 933634d8a9a374633aaebb9ccf752f32407887e3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jan  3 12:28:01 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jan  3 12:28:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=933634d8

x11-apps/xinit: Keyword 1.4.1-r1 for ~m68k

Manually tested and working.

Signed-off-by: James Le Cuirot  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 51d8f710ae2f..6fe423adfb1a 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[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/

[Matt Turner]

commit: cdc0c01eb18e0d93659b5666590812182787d34e
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Dec  2 04:59:49 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Dec  2 05:16:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc0c01e

x11-apps/xinit: Drop old

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

 x11-apps/xinit/xinit-1.4.1.ebuild | 75 ---
 1 file changed, 75 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
deleted file mode 100644
index f347aebee1ec..
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 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 ~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.0-startx-current-vt.patch"
-   "${FILESDIR}/${PN}-1.4.1-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 "${FILESDIR}"/startDM.sh
-   exeinto /etc/X11/Sessions
-   doexe "${FILESDIR}"/Xsession
-   exeinto /etc/X11/xinit
-   newexe "${FILESDIR}"/xserverrc.2 xserverrc
-   exeinto /etc/X11/xinit/xinitrc.d/
-   doexe "${FILESDIR}"/00-xhost
-
-   insinto /usr/share/xsessions
-   doins "${FILESDIR}"/Xsession.desktop
-}
-
-pkg_postinst() {
-   if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   ewarn "If you use startx to start X instead of a login manager 
like gdm/kdm,"
-   ewarn "you can set the XSESSION variable to anything in 
/etc/X11/Sessions/ or"
-   ewarn "any executable. When you run startx, it will run this as 
the login session."
-   ewarn "You can set this in a file in /etc/env.d/ for the entire 
system,"
-   ewarn "or set it per-user in ~/.bash_profile (or similar for 
other shells)."
-   ewarn "Here's an example of setting it for the whole system:"
-   ewarn "echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-   ewarn "env-update && source /etc/profile"
-   fi
-
-   for v in ${REPLACING_VERSIONS}; do
-   if ver_test "$v" "-lt" "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
-   done
-}

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

[Sam James]

commit: 2adaa474a65d985ab9d9a719478e4fe201b64e38
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Sep 23 19:45:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 23 20:12:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2adaa474

x11-apps/xinit: stable 1.4.1-r1 for hppa, bug #813729

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 350547d918c..51d8f710ae2 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sam James]

commit: a9a3c01fd15b09a7bb47def2c747bdaa31efd18d
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 22:06:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 22:07:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a3c01f

x11-apps/xinit: Stabilize 1.4.1-r1 ppc, #768039

Signed-off-by: Sam James  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 659d5c73fcf..350547d918c 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sam James]

commit: 27df15452bd327d6b1e73c74fe65ae62e74bd281
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 22:06:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 22:07:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27df1545

x11-apps/xinit: Stabilize 1.4.1-r1 ppc64, #768039

Signed-off-by: Sam James  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index fef5bdbe5d8..659d5c73fcf 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sam James]

commit: bab129bb0c270fac7b80f9ee75bfd40b30847f00
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 17:33:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 17:33:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab129bb

x11-apps/xinit: Stabilize 1.4.1-r1 x86, #768039

Signed-off-by: Sam James  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 8c53d40b56c..fef5bdbe5d8 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sam James]

commit: d8e4371941d16ee88f4687af87485515f851d411
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 17:32:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 17:32:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e43719

x11-apps/xinit: Stabilize 1.4.1-r1 amd64, #768039

Signed-off-by: Sam James  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 88224cc9561..8c53d40b56c 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sam James]

commit: c4dd37ceb62d8e000cd1f9a37a7d18246fba3b29
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  7 22:42:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  7 22:43:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4dd37ce

x11-apps/xinit: Stabilize 1.4.1-r1 arm, #768039

Signed-off-by: Sam James  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 99f00ec186b..88224cc9561 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sam James]

commit: 3e19e9d8458413e77f9b1fead564d3261d7ef419
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  7 22:40:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  7 22:42:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e19e9d8

x11-apps/xinit: Stabilize 1.4.1-r1 arm64, #768039

Signed-off-by: Sam James  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 5cf39d121c8..99f00ec186b 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sergei Trofimovich]

commit: 0f8b0ea022869ad05d390357775dcc21a770b7d5
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Feb  1 16:14:38 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  1 18:03:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8b0ea0

x11-apps/xinit: stable 1.4.1-r1 for sparc, bug #768039

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index a5d97f4e443..5cf39d121c8 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Matt Turner]

commit: 7d23816e9e9f9022618e04425c4a7c279c554fbf
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 23:41:45 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 23:43:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d23816e

x11-apps/xinit: Propagate ~riscv keywords

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

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 36ce2267f5c..a5d97f4e443 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Piotr Karbowski]

commit: 79da973a405180e9084c61af12962e87a9677d0c
Author: Aisha Tammy  aisha  cc>
AuthorDate: Thu Sep 10 01:35:47 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sat Jan 30 19:17:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79da973a

x11-apps/xinit: refactor startDM.sh to display-manager-init

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/16554
Signed-off-by: Piotr Karbowski  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 75 
 1 file changed, 75 insertions(+)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
new file mode 100644
index 000..36ce2267f5c
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 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 ~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.0-startx-current-vt.patch"
+   "${FILESDIR}/${PN}-1.4.1-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
+   newexe "${FILESDIR}"/xserverrc.2 xserverrc
+   exeinto /etc/X11/xinit/xinitrc.d/
+   doexe "${FILESDIR}"/00-xhost
+
+   insinto /usr/share/xsessions
+   doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   ewarn "If you use startx to start X instead of a login manager 
like gdm/kdm,"
+   ewarn "you can set the XSESSION variable to anything in 
/etc/X11/Sessions/ or"
+   ewarn "any executable. When you run startx, it will run this as 
the login session."
+   ewarn "You can set this in a file in /etc/env.d/ for the entire 
system,"
+   ewarn "or set it per-user in ~/.bash_profile (or similar for 
other shells)."
+   ewarn "Here's an example of setting it for the whole system:"
+   ewarn "echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+   ewarn "env-update && source /etc/profile"
+   fi
+
+   for v in ${REPLACING_VERSIONS}; do
+   if ver_test "$v" "-lt" "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
+   done
+}

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

[Matt Turner]

commit: c618b9bb685c3549e10686a0bd67c0e2c709877e
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Mar 11 18:39:21 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 11 18:41:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c618b9bb

x11-apps/xinit: Drop outdated blocker

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

 x11-apps/xinit/xinit-1.4.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index cd467fa426a..dc256942fd4 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -12,7 +12,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 
s390 ~sh sparc x86 ~a
 IUSE="twm"
 
 RDEPEND="
-   !

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

[Matt Turner]

commit: db0db442ab5220efe9ab11ea8f931ff9b83d460a
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar  9 01:50:51 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar  9 02:05:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0db442

x11-apps/xinit: Fix postinstall message

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

 x11-apps/xinit/xinit-1.4.1.ebuild | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 70f4ab1c68a..cd467fa426a 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -53,7 +53,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   if ! has_version 'x11-apps/xinit'; then
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
ewarn "If you use startx to start X instead of a login manager 
like gdm/kdm,"
ewarn "you can set the XSESSION variable to anything in 
/etc/X11/Sessions/ or"
ewarn "any executable. When you run startx, it will run this as 
the login session."
@@ -64,11 +64,13 @@ pkg_postinst() {
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
+   for v in ${REPLACING_VERSIONS}; do
+   if ver_test "$v" "-lt" "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
+   done
 }

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

[Aaron Bauman]

commit: 26a66e491a742aaf87666f1bf84b55fcc1087179
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Jul 28 17:34:55 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Jul 28 17:34:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a66e49

x11-apps/xinit: drop unused local flag

Signed-off-by: Aaron Bauman  gentoo.org>

 x11-apps/xinit/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
index f944f7012d7..2b3a2dcd7e8 100644
--- a/x11-apps/xinit/metadata.xml
+++ b/x11-apps/xinit/metadata.xml
@@ -6,10 +6,6 @@
X11


-   
-   Control dependencies on legacy apps (xterm, twm, ...). 
Safe to
-   enable if you use a modern desktop environment.
-   

Control dependencies on legacy apps (xterm, twm, ...). 
Safe to
disable if you use a modern desktop environment.

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

[Matt Turner]

commit: e24c82b2dbf27372108ac3a93d977cd762bb044a
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 22 17:21:22 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jul 28 16:40:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24c82b2

x11-apps/xinit: Drop old versions

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

 x11-apps/xinit/Manifest  |  1 -
 x11-apps/xinit/files/startDM.sh.1| 30 ---
 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 71 
 3 files changed, 102 deletions(-)

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 8b2e86bb882..ede67dd7492 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,2 +1 @@
-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/startDM.sh.1 
b/x11-apps/xinit/files/startDM.sh.1
deleted file mode 100644
index e2da6098d6a..000
--- a/x11-apps/xinit/files/startDM.sh.1
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# 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
-
-. /etc/init.d/functions.sh
-
-# 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
-
-# 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)"
-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

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
deleted file mode 100644
index e069d3d3c92..000
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~arm-linux ~x86-linux"
-IUSE="+minimal"
-
-RDEPEND="
-   ! /etc/env.d/90xsession"
-   ewarn "env-update && source /etc/profile"
-   fi
-}

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

[Mikle Kolyada]

commit: 32684a3020ab5f7be2fecb883794e44e46ba570e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 28 13:04:40 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 28 13:05:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32684a30

x11-apps/xinit: arm stable wrt bug #689510

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 4e781e48c6d..115cabaf235 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Aaron Bauman]

commit: 085f559566f1849e9ca0622b075dc2b96ce81926
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Jul 21 17:10:51 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Jul 21 17:10:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=085f5595

x11-apps/xinit: arm64 stable (bug #689510)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 4f040f11a0a..4e781e48c6d 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Agostino Sarubbo]

commit: 4d0d282a2067b605b9fca369aec7d4b4250c9f01
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 19 11:32:32 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 19 11:32:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0d282a

x11-apps/xinit: alpha stable wrt bug #689510

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 6005ec46879..4f040f11a0a 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Agostino Sarubbo]

commit: 24be50e70e4fda0cb0e27dcc0b0d399e92ebdc31
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 18 11:32:40 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 18 11:32:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24be50e7

x11-apps/xinit: ppc64 stable wrt bug #689510

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index e752b4a2ddf..6005ec46879 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Agostino Sarubbo]

commit: 3d423531f723a0cb8a76aa2e23ff181a1e1d9387
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 18 10:46:37 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 18 10:46:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d423531

x11-apps/xinit: ppc stable wrt bug #689510

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index f83d6723ec9..e752b4a2ddf 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Agostino Sarubbo]

commit: 94d19c334aa0e25607eea5c1159a40fae133b698
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 17 14:03:06 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 17 14:03:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d19c33

x11-apps/xinit: s390 stable wrt bug #689510

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="s390"

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 6e2489f2259..f83d6723ec9 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Mikle Kolyada]

commit: 2ca205a2e17d4e10c1d3ecc72eb10bf3eec60531
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Jul 17 10:16:58 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Jul 17 10:16:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca205a2

x11-apps/xinit: amd64 stable wrt bug #689510

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index cb53fa280d7..6e2489f2259 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sergei Trofimovich]

commit: 94556bf7c5c9a8ed61c72846437e57bc2bcdf1d0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 14 09:08:52 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 14 09:11:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94556bf7

x11-apps/xinit: stable 1.4.1 for ia64, bug #689510

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 9023090213c..cb53fa280d7 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sergei Trofimovich]

commit: dca16d061a96a7df1ca6f866b6e01c47df10ebc2
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Jul 13 10:14:45 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 13 10:36:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca16d06

x11-apps/xinit: stable 1.4.1 for hppa, bug #689510

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index ff00135c3fb..9023090213c 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Agostino Sarubbo]

commit: 0d2a27d551b7625be17830052cc6dca887a1f897
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 10 10:29:40 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 10 10:29:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2a27d5

x11-apps/xinit: x86 stable wrt bug #689510

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index cca8e2a4825..ff00135c3fb 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Sergei Trofimovich]

commit: a10205f725a3f8ce9278c4a0765ddbecf4301ac5
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Jul  9 20:26:44 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul  9 23:11:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10205f7

x11-apps/xinit: stable 1.4.1 for sparc, bug #689510

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 5548d932489..cca8e2a4825 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

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

[Matt Turner]

commit: 52023c1c6853f292c3bafe95b95c630dbd8d5103
Author: Matt Turner  gentoo  org>
AuthorDate: Fri May 17 16:10:31 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri May 17 16:11:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52023c1c

x11-apps/xinit: Fix installation of startDM.sh

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

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

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

[Matt Turner]

commit: 5218a3d4afe5dc550f1c44c0894d684db85060b2
Author: Matt Turner  gentoo  org>
AuthorDate: Thu May 16 17:55:44 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu May 16 17:58:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5218a3d4

x11-apps/xinit: Drop xorg-3_pkg_postinst call

xorg-3.eclass does not have a pkg_postinst function.

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

 x11-apps/xinit/xinit-1.4.1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 7217612718e..5548d932489 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -53,8 +53,6 @@ src_install() {
 }
 
 pkg_postinst() {
-   xorg-3_pkg_postinst
-
if ! has_version 'x11-apps/xinit'; then
ewarn "If you use startx to start X instead of a login manager 
like gdm/kdm,"
ewarn "you can set the XSESSION variable to anything in 
/etc/X11/Sessions/ or"

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

[Matt Turner]

commit: db267b0fb5f530eefe53866a9fcf231c4c02ef19
Author: Matt Turner  gentoo  org>
AuthorDate: Wed May 15 20:05:15 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 15 20:05:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db267b0f

x11-apps/xinit: Update metadata.xml

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

 x11-apps/xinit/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
index dce3523a34d..f944f7012d7 100644
--- a/x11-apps/xinit/metadata.xml
+++ b/x11-apps/xinit/metadata.xml
@@ -10,6 +10,10 @@
Control dependencies on legacy apps (xterm, twm, ...). 
Safe to
enable if you use a modern desktop environment.

+   
+   Control dependencies on legacy apps (xterm, twm, ...). 
Safe to
+   disable if you use a modern desktop environment.
+   


cpe:/a:x.org:xinit

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

[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/

[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/

[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/

[Matt Turner]

commit: d0ef4d020d04e5e968c13445ef44d7d64f6cef21
Author: Matt Turner  gentoo  org>
AuthorDate: Wed May 15 18:14:16 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 15 18:51:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ef4d02

x11-apps/xinit: Rename USE=minimal -> USE=twm

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

 x11-apps/xinit/xinit-1.4.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild 
b/x11-apps/xinit/xinit-1.4.1.ebuild
index 4c26bd5588c..7217612718e 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -9,7 +9,7 @@ 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"
+IUSE="twm"
 
 RDEPEND="

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

[Matt Turner]

commit: 78925d7a2cdac37e74219558419b862d81e6a9c5
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar  3 05:44:12 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar  3 05:45:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78925d7a

x11-apps/xinit: Only print postinst messages first time

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

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index a8b0150bc16..f8dedbb1ce7 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -56,12 +56,15 @@ src_install() {
 
 pkg_postinst() {
xorg-2_pkg_postinst
-   ewarn "If you use startx to start X instead of a login manager like 
gdm/kdm,"
-   ewarn "you can set the XSESSION variable to anything in 
/etc/X11/Sessions/ or"
-   ewarn "any executable. When you run startx, it will run this as the 
login session."
-   ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-   ewarn "or set it per-user in ~/.bash_profile (or similar for other 
shells)."
-   ewarn "Here's an example of setting it for the whole system:"
-   ewarn "echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-   ewarn "env-update && source /etc/profile"
+
+   if ! has_version 'x11-apps/xinit'; then
+   ewarn "If you use startx to start X instead of a login manager 
like gdm/kdm,"
+   ewarn "you can set the XSESSION variable to anything in 
/etc/X11/Sessions/ or"
+   ewarn "any executable. When you run startx, it will run this as 
the login session."
+   ewarn "You can set this in a file in /etc/env.d/ for the entire 
system,"
+   ewarn "or set it per-user in ~/.bash_profile (or similar for 
other shells)."
+   ewarn "Here's an example of setting it for the whole system:"
+   ewarn "echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+   ewarn "env-update && source /etc/profile"
+   fi
 }

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

[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/

[Mikle Kolyada]

commit: 69b30f3d905bb67bfda29dff083d73fa0fcce698
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Feb 16 07:39:15 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Feb 16 07:39:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b30f3d

x11-apps/xinit: mark s390 stable

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 6d66726b011..a8b0150bc16 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[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/

[Matt Turner]

commit: 8590effe626d532e081bf7aa6a2af60c67e6332a
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 28 05:10:41 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 28 05:10:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8590effe

x11-apps/xinit-1.4.0-r1: alpha stable, bug 675818

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

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 2098f02361f..6d66726b011 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Sergei Trofimovich]

commit: 770211db4c082337d07acd14148708ce15d4c28f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jan 27 12:15:49 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jan 27 12:18:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770211db

x11-apps/xinit: stable 1.4.0-r1 for hppa, bug #675818

Package-Manager: Portage-2.3.58, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 3cccf1c5508..5b29ccbc783 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Thomas Deutschmann]

commit: 951cdf8fd98716dc9feb7247de4246a2e7f634dd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jan 24 21:39:58 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jan 24 22:22:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951cdf8f

x11-apps/xinit: x86 stable (bug #675818)

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 5eaac0fd90a..3cccf1c5508 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Sergei Trofimovich]

commit: 465b5c98798334ec1a3439bb1d5d1cb4c034c23d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jan 21 23:21:45 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jan 21 23:21:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465b5c98

x11-apps/xinit: stable 1.4.0-r1 for ia64, bug #675818

Package-Manager: Portage-2.3.56, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 21346f47af9..5eaac0fd90a 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Mikle Kolyada]

commit: e7ece18422a572b60f81579990ab88b19c4b3240
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan 21 07:42:01 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan 21 07:42:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ece184

x11-apps/xinit: arm stable wrt bug #675818

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 89ead51c68a..21346f47af9 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Mikle Kolyada]

commit: e52f63a204923046debe9011dbeee366dc6f49de
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan 21 07:37:48 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan 21 07:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52f63a2

x11-apps/xinit: amd64 stable wrt bug #675818

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index d1051799775..89ead51c68a 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Sergei Trofimovich]

commit: d18127354ed2625d4a84328726a3f445a0097d30
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Jan 20 08:23:30 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jan 20 09:53:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1812735

x11-apps/xinit: stable 1.4.0-r1 for sparc, bug #675818

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 03af60780e5..d1051799775 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Mart Raudsepp]

commit: 95a332a4bbc2c5330ce8d974ec58c448f84cf485
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Jan 19 19:43:45 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jan 19 20:08:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a332a4

x11-apps/xinit: arm64 stable

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 13cf2917ed8..03af60780e5 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Matt Turner]

commit: 9d68e491c96541f7cbf3d5766597906561bbf512
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Mar 11 15:32:43 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Nov 27 22:43:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d68e491

x11-apps/xinit: xserverrc: pass -keeptty for systemd-logind support

Closes: https://github.com/gentoo/gentoo/pull/7423
Closes: https://bugs.gentoo.org/603294
Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/files/xserverrc.2 |  6 
 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 67 
 2 files changed, 73 insertions(+)

diff --git a/x11-apps/xinit/files/xserverrc.2 b/x11-apps/xinit/files/xserverrc.2
new file mode 100644
index 000..8d5b2c3f790
--- /dev/null
+++ b/x11-apps/xinit/files/xserverrc.2
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+  exec /usr/bin/X -nolisten tcp "$@"
+else
+  exec /usr/bin/X -nolisten tcp -keeptty "$@" "vt$XDG_VTNR"
+fi

diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
new file mode 100644
index 000..13cf2917ed8
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -0,0 +1,67 @@
+# 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 ~arm-linux ~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/

[Mikle Kolyada]

commit: 0ef3c03c5b323585c197fa15b63bafca0df49264
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Aug 17 01:53:20 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Aug 17 02:05:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef3c03c

x11-apps/xinit: mark s390 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-apps/xinit/xinit-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index 67abbac0edf..11869af32fe 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[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/

[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 

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

[Markus Meier]

commit: b82561f1dfe4ee9f0f1f44fc97ac9a50682e66b0
Author: Markus Meier  gentoo  org>
AuthorDate: Sun May 13 11:26:24 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun May 13 11:26:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b82561f1

x11-apps/xinit: arm stable, bug #649316

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"

 x11-apps/xinit/xinit-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index b52564c0651..980a062d135 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Sergei Trofimovich]

commit: a7a82e94177ea8ea79322890e2b3d72499351adf
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon May  7 22:49:56 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue May  8 06:23:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a82e94

x11-apps/xinit: stable 1.4.0 for sparc

Bug: https://bugs.gentoo.org/649316
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 x11-apps/xinit/xinit-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index b3dbf85429e..b52564c0651 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Thomas Deutschmann]

commit: 5458075b62822d6b915e97ead2578ae14e6a5a2c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May  7 17:56:20 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May  7 19:22:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5458075b

x11-apps/xinit: x86 stable (bug #649316)

Package-Manager: Portage-2.3.34, Repoman-2.3.9

 x11-apps/xinit/xinit-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index 16c2a44bf18..b3dbf85429e 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Matt Turner]

commit: df44f771bb103473ba83d5e0d23dd46c4f3ab963
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May  6 20:45:13 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun May  6 20:45:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df44f771

x11-apps/xinit-1.4.0: ppc64 stable, bug 649316

 x11-apps/xinit/xinit-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index b98d068e11e..16c2a44bf18 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Sergei Trofimovich]

commit: 0578dd147ec4b83b4c7f3688e2319b9cf2bbccef
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May  6 19:38:40 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May  6 19:38:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0578dd14

x11-apps/xinit: stable 1.4.0 for ia64, bug #649316

Bug: https://bugs.gentoo.org/649316
Package-Manager: Portage-2.3.36, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 x11-apps/xinit/xinit-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index 3c27e57bc30..100e50fd4b7 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Matt Turner]

commit: 5d2075a162bfc08f6267d4f1294cd86031d1e8c5
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May  6 19:21:51 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun May  6 19:22:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2075a1

x11-apps/xinit-1.4.0: alpha stable, bug 649316

 x11-apps/xinit/xinit-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index 2b907b4d635..3c27e57bc30 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Mikle Kolyada]

commit: 68263d124ad4aa8cc4fad1d5ce166707517348ec
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  6 12:23:15 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  6 12:23:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68263d12

x11-apps/xinit: amd64 stable wrt bug #649316

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-apps/xinit/xinit-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index c2d2baabb33..2b907b4d635 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux"
+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="

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

[Matt Turner]

commit: b5d149489d0d734466fe09c232b5ed42ec9ec9f1
Author: Marty E. Plummer  startmail  com>
AuthorDate: Sat Mar 10 05:32:38 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Mar 10 05:55:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d14948

x11-apps/xinit: rebase xinit-1.3.4-startx-current-vt.patch

Patch no longer cleanly applies, fixed it up to apply on new version
using quilt. Builds properly on my system.

Closes: https://bugs.gentoo.org/650066
Signed-off-by: Marty E. Plummer  startmail.com>
Closes: https://github.com/gentoo/gentoo/pull/7412

 .../xinit/files/xinit-1.4.0-startx-current-vt.patch  | 20 
 x11-apps/xinit/xinit-1.4.0.ebuild|  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch 
b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch
new file mode 100644
index 000..ecddd3b369e
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch
@@ -0,0 +1,20 @@
+--- a/startx.cpp
 b/startx.cpp
+@@ -200,17 +200,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=$(echo "$tty" | grep -oE '[0-9]+$')
+-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

diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
index ea3e115f959..c2d2baabb33 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -28,7 +28,7 @@ PDEPEND="x11-apps/xrdb
 
 PATCHES=(
"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
-   "${FILESDIR}/${PN}-1.3.4-startx-current-vt.patch"
+   "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch"
 )
 
 src_configure() {

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

[Matt Turner]

commit: 23a81ba44cf153563a566987ce1513258e5c02fd
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Mar 10 02:18:47 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Mar 10 02:29:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a81ba4

x11-apps/xinit: Version bump to 1.4.0

 x11-apps/xinit/Manifest   |  1 +
 x11-apps/xinit/xinit-1.4.0.ebuild | 67 +++
 2 files changed, 68 insertions(+)

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index e9bba13bce0..c8a83bfc0c5 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1 +1,2 @@
 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/xinit-1.4.0.ebuild 
b/x11-apps/xinit/xinit-1.4.0.ebuild
new file mode 100644
index 000..ea3e115f959
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -0,0 +1,67 @@
+# 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 ~arm-linux ~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/

[Mike Gilbert]

commit: 024a727b2db862ff122216a324c3ca4177e2785b
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jan  6 22:40:58 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jan  6 22:42:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024a727b

x11-apps/xinit: apply vt patch unconditionally

Our xserverrc file already takes care of passing the correct vt, so we
don't need startx to do it too.

Closes: https://bugs.gentoo.org/620896
Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37

 x11-apps/xinit/xinit-1.3.4-r4.ebuild | 67 
 1 file changed, 67 insertions(+)

diff --git a/x11-apps/xinit/xinit-1.3.4-r4.ebuild 
b/x11-apps/xinit/xinit-1.3.4-r4.ebuild
new file mode 100644
index 000..ea3e115f959
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.4-r4.ebuild
@@ -0,0 +1,67 @@
+# 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 ~arm-linux ~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/

[Markus Meier]

commit: 7dc2856dac3946196c4836331dc265ce577e8e3c
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Dec 23 11:16:15 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Dec 23 11:16:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dc2856d

x11-apps/xinit: add ~arm64, bug #640180

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="arm64"

 x11-apps/xinit/xinit-1.3.4-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.3.4-r3.ebuild 
b/x11-apps/xinit/xinit-1.3.4-r3.ebuild
index e2265f0596c..9cca45f0328 100644
--- a/x11-apps/xinit/xinit-1.3.4-r3.ebuild
+++ b/x11-apps/xinit/xinit-1.3.4-r3.ebuild
@@ -8,7 +8,7 @@ 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 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal systemd"
 
 RDEPEND="

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

[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/

[Matt Turner]

commit: 9bd33b8105427c8f92ca509c1cf60d0bf67f7aad
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct 19 16:07:07 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct 19 16:07:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd33b81

x11-apps/xinit: Rev bump to -r3 after previous commit's revert

Closes: https://bugs.gentoo.org/634706
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --force

 x11-apps/xinit/{xinit-1.3.4-r2.ebuild => xinit-1.3.4-r3.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/x11-apps/xinit/xinit-1.3.4-r2.ebuild 
b/x11-apps/xinit/xinit-1.3.4-r3.ebuild
similarity index 95%
rename from x11-apps/xinit/xinit-1.3.4-r2.ebuild
rename to x11-apps/xinit/xinit-1.3.4-r3.ebuild
index d07cc9662f8..e2265f0596c 100644
--- a/x11-apps/xinit/xinit-1.3.4-r2.ebuild
+++ b/x11-apps/xinit/xinit-1.3.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-f
 IUSE="+minimal systemd"
 
 RDEPEND="
-   !systemd? ( sys-apps/gentoo-functions )
!

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

[Matt Turner]

commit: 1708a07bc630c6f0c4179a3242006b4e1b198cd0
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Oct 18 23:52:56 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Oct 18 23:54:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1708a07b

x11-apps/xinit: Drop old versions

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

 x11-apps/xinit/Manifest  |  1 -
 x11-apps/xinit/xinit-1.3.3-r1.ebuild | 66 
 x11-apps/xinit/xinit-1.3.3.ebuild| 66 
 x11-apps/xinit/xinit-1.3.4-r1.ebuild | 74 
 4 files changed, 207 deletions(-)

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index f8fa78aa366..8e564ec559d 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,2 +1 @@
-DIST xinit-1.3.3.tar.bz2 163905 SHA256 
74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af SHA512 
345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65
 WHIRLPOOL 
106656351391ff8de397394d56ea225f910f82be3cbacaf81c0735d2a259437632bd5428fc96900a0b88146fd11f8d8670f07f3dd2869b44ff6525c399b936f4
 DIST xinit-1.3.4.tar.bz2 165881 SHA256 
75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 SHA512 
ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e
 WHIRLPOOL 
2362d69caffcaca6e6d284fcc7438fa6a81c36e79a20f23d32a67a5de9e6d64a9680d2f513e6718312d6e25117af90f28c17f70da0189595021198390eb1

diff --git a/x11-apps/xinit/xinit-1.3.3-r1.ebuild 
b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
deleted file mode 100644
index 99c44ccf7a3..000
--- a/x11-apps/xinit/xinit-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 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 ~arm-linux ~x86-linux"
-IUSE="+minimal"
-
-RDEPEND="
-   ! /etc/env.d/90xsession"
-   ewarn "env-update && source /etc/profile"
-}

diff --git a/x11-apps/xinit/xinit-1.3.3.ebuild 
b/x11-apps/xinit/xinit-1.3.3.ebuild
deleted file mode 100644
index ce597213f6e..000
--- a/x11-apps/xinit/xinit-1.3.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 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 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"
-}

diff --git a/x11-apps/xinit/xinit-1.3.4-r1.ebuild 
b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
deleted file mode 100644
index 51dc72d6fef..000
--- a/x11-apps/xinit/xinit-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+minimal systemd"
-
-RDEPEND="
-   ! /etc/env.d/90xsession"
-   ewarn "env-update && source /etc/profile"
-}

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

[Matt Turner]

commit: 031cfd0fe8b099adf04c75360a4054f9edc6217b
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Oct 18 23:49:18 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Oct 18 23:53:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031cfd0f

x11-apps/xinit: Rev bump for commit 2bb6b9e50bdb

Commit 2bb6b9e50bdb8efc9a4627e60a4e63d38e8d6255 ("x11-apps/xinit: use
/lib/gentoo/functions.sh instead of deprecated
/etc/init.d/functions.sh") modified a file installed by all versions of
the package (which were all stable) without a rev bump. It also
neglected to add a dependency on sys-apps/gentoo-functions.

This commit revs the version (straight to stable) so users get the new
startDM.sh script, and the next commit will remove all other xinit
versions.

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

 x11-apps/xinit/xinit-1.3.4-r2.ebuild | 75 
 1 file changed, 75 insertions(+)

diff --git a/x11-apps/xinit/xinit-1.3.4-r2.ebuild 
b/x11-apps/xinit/xinit-1.3.4-r2.ebuild
new file mode 100644
index 000..d07cc9662f8
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.4-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal systemd"
+
+RDEPEND="
+   !systemd? ( sys-apps/gentoo-functions )
+   ! /etc/env.d/90xsession"
+   ewarn "env-update && source /etc/profile"
+}

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

[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/

[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
-

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

[Markus Meier]

commit: 6019353ae09571dd911a3769a761d17504053147
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Dec 19 21:24:25 2015 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Dec 19 21:24:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6019353a

x11-apps/xinit: arm stable, bug #559062

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"

 x11-apps/xinit/xinit-1.3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.3.4-r1.ebuild 
b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
index 2950058..624d522 100644
--- a/x11-apps/xinit/xinit-1.3.4-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
@@ -9,7 +9,7 @@ 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="+minimal systemd"
 
 RDEPEND="