gentoo resync : 29.01.2021

6 files changed, 15 insertions, 22 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 7998d1469671..20b8a793fc30 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index fdaa29d72bc2..b49e86360290 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1,3 +1,3 @@
 DIST xconsole-1.0.7.tar.bz2 134832 BLAKE2B 20f9729d0aad2aceb1c7197b2ae45f65088dc39fb5980eb41a39935fb180ee7181c560ef180b0413b28adf36882a13fbdbd454d8b6dbb0cc06f69632f903b546 SHA512 89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9
-EBUILD xconsole-1.0.7.ebuild 365 BLAKE2B d150676a22fa5f648dd688c9dcbe1e22f06e4a656371f089652ff52ae0a5dffed11d45d868165955994562dac19984e57e6fe0dff80a106c0f7db338c0ff03fe SHA512 2dd59aefb9ccd296ac5dfb70d5830c95ecac4ae7b09cacf5451126d7b97e742666976f3284969aca2ce42f4637b0e81a6a428c1656ee333a1baca6f524fc059c
+EBUILD xconsole-1.0.7.ebuild 359 BLAKE2B ad7a6e1bb2f58710854a8ba60f38a4b5d9e1f21e3a1a90a7a9f0086f67bb7b2778494e9e672909f15a03639b58bb9ebebaa4ddf4821a31feb12abbfc0de75264 SHA512 70d28164e4ef2ff83d365b4d0be690dcba8fb7a373ac17b5976ac47888af9fc49f9218e266793440e229e437b90e6b0b9694a43eb58b1c2c205a0783b00e34bf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xconsole/xconsole-1.0.7.ebuild b/x11-apps/xconsole/xconsole-1.0.7.ebuild
index 9c2634f62a53..afb11e0da2d0 100644
--- a/x11-apps/xconsole/xconsole-1.0.7.ebuild
+++ b/x11-apps/xconsole/xconsole-1.0.7.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="monitor system console messages with X"
+
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
+
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index 800efff144dc..dce3a0a5efa3 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,3 +1,3 @@
 DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
-EBUILD xsm-1.0.4.ebuild 816 BLAKE2B 9814ad1a9912b6eb07904bdce63ac5600139fa1b8114b0c471f0b9298d8dbaee2f37e7eba6872e413e84712145f471c47304579f609b8712547a60c4093bbf65 SHA512 20da97a0f930c3750249e82c7fc926b86c38e454cbdeb40b36ff3225c622e690442c2d37f8affd46f0b9a3d93aaba0f18571ea009d70566e377bc28fab9346e1
-MISC metadata.xml 333 BLAKE2B 0b142d7cf4b255c50a9e616434af7ff1db6a2aa0d3467f43d3e22ce6ce55a1bae7ab18eaf092bd5ca002464dc046bc2de62b3738425cdecf4ad15727b20f2d18 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2
+EBUILD xsm-1.0.4.ebuild 676 BLAKE2B 7e67f478cd09516db3de2df74e62b21ef9328b50545a16dc282ef7d99ffce78d031a93646941974dcc6c8156ebc4693c07baee6cb67d1ac3102d4aaf7cbf2ff1 SHA512 9450f639e454bea92700eb9325c0fbd049ac7d50b1d17167c3ed9e7d78f698a13f1ca399e003c36cdf37fb6258c0e45bfc6d178bef841f7697eca89a547218d4
+MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsm/metadata.xml b/x11-apps/xsm/metadata.xml
index e8a1a945c76f..e943b72b8a48 100644
--- a/x11-apps/xsm/metadata.xml
+++ b/x11-apps/xsm/metadata.xml
@@ -5,7 +5,4 @@
 	<email>x11@gentoo.org</email>
 	<name>X11</name>
 </maintainer>
-<use>
-	<flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy).</flag>
-</use>
 </pkgmetadata>
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
index ddd4fcc32c10..a29b381dec80 100644
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ b/x11-apps/xsm/xsm-1.0.4.ebuild
@@ -1,32 +1,27 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X Session Manager"
+
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="rsh"
+
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libICE
-	x11-libs/libSM
-	rsh? ( net-misc/netkit-rsh )"
+	x11-libs/libSM"
 DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# (#158056) /usr/$(get_libdir)/X11/xsm could be a symlink
-	local XSMPATH="${EROOT}usr/$(get_libdir)/X11/xsm"
+	local XSMPATH="${EROOT}/usr/$(get_libdir)/X11/xsm"
 	if [[ -L ${XSMPATH} ]]; then
 		einfo "Removing symlink ${XSMPATH}"
 		rm -f ${XSMPATH} || die "failed to remove symlink ${XSMPATH}"
 	fi
-	xorg-2_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS="$(use_with rsh rsh /usr/bin/rsh)"
-	xorg-2_src_configure
+	xorg-3_pkg_setup
 }