[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

[Matt Turner]

commit:     bc6c05dd2f7fef8552e902f6a477e24a03059949
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 01:13:49 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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