gentoo resync : 22.12.2021

8 files changed, 4 insertions, 40 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 77fded46ceed..c3687d266122 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index cba30d8bcafb..a479da333cec 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,5 +1,5 @@
 DIST luit-20190106.tgz 190866 BLAKE2B 44098a00cade37aacdd7e67e1dae68157b652458b8a059de3dc56be9cc79ffba2ba861d403ab65de640853e0aec38c7d8d67febb5b6ae852a25430d2988c3661 SHA512 4324ff2793635e12e7fc0df2d7c5cdeb6241591105d0cfaf40a0da06a08764f08c5ef5f6fc19bc0e5d1f4b34b90e14b7aa393a0e613f5e096c6f91c90988215b
 DIST luit-20210218.tgz 202363 BLAKE2B a7eb88c567125e66b6f257f5f1365cc20cf30a37ec4d172c9d6396f3aebf0e5e505af604df109eebde195dc5152afe50e6ac82f485f3309c852d1dca7cae5f27 SHA512 92bfdfd5b03c73803caaf3ffb1eb92660c6c97c30b7d716454df1b5007af9cf7f75d8f255841a87f8fe266c33bff9af6c1195eb13e5160b7787a3a9e693b21e8
 EBUILD luit-20190106.ebuild 638 BLAKE2B e20f5efaacb29eca2768254115e6d3d3a820e9f0fb24b3621df2a0f3bd721e6e4e1003eccb2d94adbb77a0a154c8f18fae01fe38fb877cf5e152f51f5c5080a8 SHA512 32e422c19cfd3c2040af081db37a03ef99a6d5fc4aeabb95e4e2cd3bd946dfc1aba8602359610b0249573bc385757767d7ca7930f7123affd63d383f24a35194
-EBUILD luit-20210218.ebuild 637 BLAKE2B 4f74e3a515491cd6ac65830f71d71c65f266ea8c1c92687526a7d30f06377f007dd2a1c0c10aa57fbe965071a2416f0419f374bda5295f2d54879547c46ecb90 SHA512 051d2412a4756149f182b04465277172ae21f009a82167536beaa93a5fa8df12be4f2bdb94652259c68637b04a8e8b8c84c91dc24994970d688eae991e9a7bff
+EBUILD luit-20210218.ebuild 630 BLAKE2B 38c81a53abac5dc225f4c77db8766fa593d4c161fd943c0d9a596dd4366e3ff6702affb3aea21797e3ea17ef9153384a0286f0b8ae2807126ee53271d365937c SHA512 427e23c78c7aed0af01bff5d389f136e70e1af7ccfed473d51946c69494a96d6d7d679c940342c222a461547feb777c16f2a1465e16da3bacb12084a22a8c7e0
 MISC metadata.xml 266 BLAKE2B 480d87d101d6c5967bb91a576bb1c3702ebf9b6aceafcb69a7a25a89927cdb7fa48a4d305c8636b580c1261497c215c94c9136340ebde6a2f39a49c671d5bc8f SHA512 138e12ed699397d42af1e5b9bcb5c9d94235ff5333192258b93b0b30f0f7a0ba7c321e3c8d4fa79d6da60c3f19286caf01a675e4d9b1f04ed935b93310890cc6
diff --git a/x11-apps/luit/luit-20210218.ebuild b/x11-apps/luit/luit-20210218.ebuild
index 352027e6a1a2..fc2480e3f601 100644
--- a/x11-apps/luit/luit-20210218.ebuild
+++ b/x11-apps/luit/luit-20210218.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="sys-libs/zlib
 	virtual/libiconv"
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index bba0fed2a6c4..cb3d3d5773a7 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,5 @@
 AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
 DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
-EBUILD mesa-progs-8.4.0-r1.ebuild 1938 BLAKE2B afb6f35321e54991b2c6dc8ff5332a039fd121004974eefc96bce976102caf5f45f6228984b3203360a4791177e741a48eb7dd37eb896679eb862ccf600dfada SHA512 56718a52c9d4de97a95312659edd4997a2f7221edf00654da1095699d1aa389f0e174e6edcb03f486e0beb914c6c893b7a12cfd62c87391e112e43a4f8964a98
-EBUILD mesa-progs-9999.ebuild 1901 BLAKE2B 5ff50ee415d4701d3696e456d6f227cc6b3153db7830d1a462c575915a57d573cda6c23e62bb418ea42d7ed004785b9435434b165a11cdbab844a08bb078a406 SHA512 754f4e34af00e3253e360c7a89b18b9d3590ab9cc66de400bde00764096853a0718fe2ef7125ac492cc31c72a6326d652e9416a91b1bc19a62212658881270e6
+EBUILD mesa-progs-8.4.0-r1.ebuild 1913 BLAKE2B 835635568c965741f3ad48e4921011ac4aabd0b5032a05ee7e53894942dccac78f9bdb5767b9ce09182b0f7819899f4163c55b6d91b1a69c15d2bdb700462584 SHA512 0bba7f77b310f3a0511acb711aeec47b69ffe29b35bc35e374dc918247820121ba17dd2bc3d7ede88cc2cb0c744a653284aa9e3d0a691157326a46b8ba051aa7
+EBUILD mesa-progs-9999.ebuild 1876 BLAKE2B a9072b8eb308a99945813384d671f87f06a2d61dc6bf0795fb8c54230856bab5ca545a454fdb16334c0fe19a9e5c4b3ce0dfce225d256bb23588d9328d55bacc SHA512 92a4f6e7e976c0a99ad1870a44659c2aff9f20bdf70d48dded22bf2b28343814d11fbd60cfbfae95c651bfdd1dc2f07cd4d6da517aba90fb97e74a2c3ab15500
 MISC metadata.xml 476 BLAKE2B 2f40a2161f77a5ac55a486f6570c4fca5b85f6c28189f22c8e8a373ffb0fe69329a83babb777a53d4f73c87e3ae1ba54cd3e0fcac25b62ce19e55505ce6d602d SHA512 f6c0f2910974cfb42cf748287bed94281cc7753c2632dd4fa4dc6baa0c261d1c408f792c259c4d66251a6449698aa9dcae8690b9f5aea687f73868571d9a48a6
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
index cafb05dd7c1a..010a242b8c96 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit toolchain-funcs
-
 MY_PN="${PN/progs/demos}"
 MY_P="${MY_PN}-${PV}"
 
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 413b7365eaf8..ac2f9b7db41f 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit toolchain-funcs
-
 MY_PN="${PN/progs/demos}"
 MY_P="${MY_PN}-${PV}"
 
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 302c75881860..60582e392156 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -2,7 +2,6 @@ AUX 00-xhost 255 BLAKE2B 78ccf786ceae797177342b77fb675068786815818796a04087a8f52
 AUX Xsession 2187 BLAKE2B d6df80e9d0faecd9286be70b2639b7bb993d363a7834cd63b108be2ed35457faf8d5069803fb80275cd7f0afc155ffbc359bb7e3184c5468b2e00e63b4605a99 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048
 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 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
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
deleted file mode 100644
index 640bb24b7a26..000000000000
--- 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