gentoo resync : 02.08.2019

5 files changed, 3 insertions, 111 deletions

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 8a68dbc14365..c277369168db 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -3,13 +3,10 @@ AUX Xsession 2187 BLAKE2B d6df80e9d0faecd9286be70b2639b7bb993d363a7834cd63b108be
 AUX Xsession.desktop 229 BLAKE2B f1daf7f0ef98a3be220195fb64bc057180db20016ef991e5d2000c60b74cb729a962270ff342e29088e9e928a163732c7b1f7aafc1c056e85d73b6ca8ba9e96c SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d
 AUX chooser.sh 1192 BLAKE2B d0afaaed792dae06c4716ea33924568aca5da3251b15067fc5ba92b2dd5651185ce64329a69ae588f5a4532b8e4b123f7f29bd2db7352df1b496a6e4e03191a8 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255
 AUX startDM.sh 865 BLAKE2B 3ce0d56b0e9dda5ca9db024204414f250887d1a42059148e0fdcd3441f126ff8230e0e1822d8cb4e80fce4f64ea1dc20d06baa993850aae55ecf090461f8854f SHA512 27326fca0aae7a1cda0e1c8d84c4de2c69999b3a334c4cc31c6cca9da4b5c5294486af5992278088e05046b44abb20d0c87aee2bfb9e5aa35c9cdb2c9c2852f4
-AUX startDM.sh.1 821 BLAKE2B 2705e4a5fdadc1d7da7ef9d9df1b1c56ce3e36170658b49d3129ffd25f02339524547a5764b4d72e7b94c20f292f88137515ed775029a24102789b4955d29189 SHA512 11a21170c0db92d5f0bf40b07158f9781df611737cca5bc6a4ca8be376e179dab68e9579b112e8f8ce423af7e651e502aadd3b3d425465f7a15103777b647110
 AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee07078648101a3f82b10d5953084c6afe6564530132fb92d299c44559e4d6d3ab74554139be02c285b2076b959413ec248b57cc2aafbc733 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b
 AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f935afbb757908d0c94f6f5b9c7e6b8055841fcdf4de44af964fe3703d2599b9097fca300551bb4a3dce003e20c266d619eb49 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15
 AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 BLAKE2B 6a964926b4f5eda566be4ff5c0f015ca2d3a9f39f16ba5af0cf3816c56cf458e616645ace1b8be9873c604322ab56b118a7a9e531533f8617cb647a57cf0cf3e SHA512 0fb93f0cebfd4091d7e58139ef375fec931392159b3b060d699d118c89d4403fd5cee82cd35582aedf7dd752aee495724119f864b17988d0dd9a5dfe76c88ce0
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
-DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
 DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
-EBUILD xinit-1.4.0-r1.ebuild 1831 BLAKE2B dbd073e60166dfe8a4be89dd1ac3fb9521b4f26b441f8dae835127e45533c93c5fac61673b49991612c0b4f8ab8ab96b50020b154db515976b7d7a20a3a3a067 SHA512 25639916b11982c789d061a4ea9a47ff92724c8412a8fb0290fa50ffbc9d17a4252843b8fc94abaa90adda8df6e400e933788e1c3e3508ceaf7cc61ddebbadde
-EBUILD xinit-1.4.1.ebuild 2255 BLAKE2B 7883f185967431d7b6fdc473a012242a92abcc19181b7645b2aba912a74d796980301c7507f41267f20328a7f98645cdd4d518c1c9476a00abe28d03d29fb3fc SHA512 efd90588446e0324e661c527f20a9783fee27fd95c056516825ea158d3b20c859f2e75990590a9772b6fde92000ba114115c0b952083ef3c9a1648e801cff3f1
-MISC metadata.xml 628 BLAKE2B 15035295f88d4214959761156b63c4ec3997b06306c5e1cf61e33cd976c857564185abdc0cf7ead35688cbffa620e7d8da69c019281bd5efedccece6b42e3e05 SHA512 505e7ab74b57b8e137347a7a204f49548d4316e1c238f5c916ebc4d8d87666f854b188819259c6529bdedf1113c113c9088591e16abe4fe22f62d7d0a329054d
+EBUILD xinit-1.4.1.ebuild 2253 BLAKE2B e9026b79926f2a838f846ab518dd1fe13515a87ba2c383fd256fb557ed600861cb26f9f5ee932cce7d674a05c15b703b2b565144cc95aec2d95a780a855b0e2a SHA512 7ca0c6c531503061145aef9128ac4448dad378cb1dc46ad5a1d72bb2a3c6e2c7098db3fadabe0a8bcc5c1fe1553a802fa11e8e23c635ca8aaffebfdc05497ddf
+MISC metadata.xml 477 BLAKE2B 96cb48063d5da3ee74d3c6080b849841fb1b276338db584d51bac71b5b2c3df0ecd876055a3c11e18f46c4d879a90ef91713166cae2aef65ea7725ab639b116f SHA512 c3e1095f0e3e017439777b3113d16ceccdc5ee7127da7f9e994126d6f51227a07c831e082d58c9c094aa6fed3e789458a212e27ec497fd3a14ba4cc5e4956205
diff --git a/x11-apps/xinit/files/startDM.sh.1 b/x11-apps/xinit/files/startDM.sh.1
deleted file mode 100644
index e2da6098d6a0..000000000000
--- 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/metadata.xml b/x11-apps/xinit/metadata.xml
index f944f7012d76..2b3a2dcd7e8b 100644
--- a/x11-apps/xinit/metadata.xml
+++ b/x11-apps/xinit/metadata.xml
@@ -6,10 +6,6 @@
 		<name>X11</name>
 	</maintainer>
 	<use>
-		<flag name="minimal">
-			Control dependencies on legacy apps (xterm, twm, ...). Safe to
-			enable if you use a modern desktop environment.
-		</flag>
 		<flag name="twm">
 			Control dependencies on legacy apps (xterm, twm, ...). Safe to
 			disable if you use a modern desktop environment.
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 e069d3d3c92e..000000000000
--- 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="
-	!<x11-base/xorg-server-1.8.0
-	x11-apps/xauth
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-PDEPEND="x11-apps/xrdb
-	!minimal? (
-		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"
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xinitdir="${EPREFIX}"/etc/X11/xinit
-	)
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh
-	newexe "${FILESDIR}"/startDM.sh.1 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() {
-	xorg-2_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"
-		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
-}
diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild
index 4f040f11a0a3..115cabaf2356 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="