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 4EB8213933E for ; Thu, 8 Jul 2021 01:34:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F198E0D64; Thu, 8 Jul 2021 01:34:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 D7DDAE0D92 for ; Thu, 8 Jul 2021 01:34:08 +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 6BD4C342B40 for ; Thu, 8 Jul 2021 01:34:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B28977C1 for ; Thu, 8 Jul 2021 01:34:05 +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: <1625707557.bc6c05dd2f7fef8552e902f6a477e24a03059949.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: bc6c05dd2f7fef8552e902f6a477e24a03059949 X-VCS-Branch: master Date: Thu, 8 Jul 2021 01:34:05 +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: b1d27f8f-8c07-4d83-a558-a5dbdd368177 X-Archives-Hash: 48c0f704879eaefe6c7ee2ab188474ca commit: bc6c05dd2f7fef8552e902f6a477e24a03059949 Author: Matt Turner gentoo org> AuthorDate: Thu Jul 8 01:13:49 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Jul 8 01:25:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6c05dd x11-base/xorg-server: Don't install cvt or its man page Moved to x11-libs/libxcvt. Signed-off-by: Matt Turner gentoo.org> .../{xorg-server-9999.ebuild => xorg-server-1.20.11-r3.ebuild} | 5 ++++- x11-base/xorg-server/xorg-server-9999.ebuild | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild similarity index 98% copy from x11-base/xorg-server/xorg-server-9999.ebuild copy to x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild index 8ef94083597..29069a22532 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild @@ -91,7 +91,6 @@ DEPEND="${CDEPEND} ) ) ) - wayland? ( x11-base/xwayland ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) @@ -200,6 +199,10 @@ src_install() { if ! use minimal && use xorg; then # Install xorg.conf.example into docs dodoc "${S}"/hw/xfree86/xorg.conf.example + + rm \ + "${ED}"/usr/bin/cvt \ + "${ED}"/usr/share/man/man1/cvt.1 || die fi # install the @x11-module-rebuild set for Portage diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 8ef94083597..22242af2138 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -200,6 +200,10 @@ src_install() { if ! use minimal && use xorg; then # Install xorg.conf.example into docs dodoc "${S}"/hw/xfree86/xorg.conf.example + + rm \ + "${ED}"/usr/bin/cvt \ + "${ED}"/usr/share/man/man1/cvt.1 || die fi # install the @x11-module-rebuild set for Portage