From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B273413835B for ; Fri, 22 Jan 2021 21:57:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07B42E0BE3; Fri, 22 Jan 2021 21:57:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6416E0BE3 for ; Fri, 22 Jan 2021 21:57:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E156E340CFB for ; Fri, 22 Jan 2021 21:57:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8421E4A4 for ; Fri, 22 Jan 2021 21:57:23 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1611352636.0a05dafd1c87c7f9943c77e89763a93d203e441a.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/xsm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-apps/xsm/metadata.xml x11-apps/xsm/xsm-1.0.4.ebuild X-VCS-Directories: x11-apps/xsm/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0a05dafd1c87c7f9943c77e89763a93d203e441a X-VCS-Branch: master Date: Fri, 22 Jan 2021 21:57:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b97fd961-fab8-4e63-8b87-dfa0d270d8b1 X-Archives-Hash: f7f390d47e00ecbd139c5cd5732dba6b commit: 0a05dafd1c87c7f9943c77e89763a93d203e441a Author: David Michael gmail com> AuthorDate: Mon Jan 11 01:23:58 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Jan 22 21:57:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a05dafd x11-apps/xsm: EAPI 7 Drop the rsh flag to stick with the default behavior of using SSH. When disabled, it would replace the command path with "no". Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: David Michael gmail.com> Signed-off-by: Matt Turner gentoo.org> x11-apps/xsm/metadata.xml | 3 --- x11-apps/xsm/xsm-1.0.4.ebuild | 19 +++++++------------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/x11-apps/xsm/metadata.xml b/x11-apps/xsm/metadata.xml index e8a1a945c76..e943b72b8a4 100644 --- a/x11-apps/xsm/metadata.xml +++ b/x11-apps/xsm/metadata.xml @@ -5,7 +5,4 @@ x11@gentoo.org X11 - - This allows the use of rsh (remote shell) and rcp (remote copy). - diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild index ddd4fcc32c1..a29b381dec8 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 }