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

[Jakov Smolić]

commit:     c53cafdc2a3d2cb6ba6b1132ef1fc5a391e09c18
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 04:38:36 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 04:38:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53cafdc

x11-base/xorg-x11: treeclean

Closes: https://bugs.gentoo.org/755233
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 profiles/package.mask                    |   9 --
 x11-base/xorg-x11/metadata.xml           |  11 ---
 x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild | 138 -------------------------------
 3 files changed, 158 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 9f10b6339f17..1b01cc629aeb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -345,15 +345,6 @@ media-plugins/gmpc-playlistsort
 media-plugins/gmpc-shout
 media-plugins/gmpc-tagedit
 
-# Matt Turner <mattst88@g.o> (2022-10-01)
-# Metapackage that has outlived its purpose. Made some sense in the immediate
-# aftermath of X.Org modularization 15 years ago.
-# Use these instead if desired:
-# - x11-base/xorg-apps
-# - x11-base/xorg-fonts
-# Removal on 2022-11-01. Bugs #755233, #872119.
-x11-base/xorg-x11
-
 # Brian Evans <grknight@g.o> (2022-09-30)
 # Mask RC versions for initial testing
 <dev-lang/php-8.2.0:8.2

diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml
deleted file mode 100644
index 0fd7de8410c8..000000000000
--- a/x11-base/xorg-x11/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>x11@g.o</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="fonts">Install fonts from X.Org</flag>
-</use>
-</pkgmetadata>

diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
deleted file mode 100644
index 348cdce0a94c..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
-HOMEPAGE="https://www.x.org/wiki/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="+fonts"
-
-# Server
-RDEPEND="${RDEPEND}
-	x11-base/xorg-server[-minimal]"
-
-# Applications
-RDEPEND="${RDEPEND}
-	x11-apps/appres
-	x11-apps/bitmap
-	x11-apps/iceauth
-	x11-apps/luit
-	>=x11-apps/mkfontscale-1.2.0
-	x11-apps/sessreg
-	x11-apps/setxkbmap
-	x11-apps/smproxy
-	x11-apps/x11perf
-	x11-apps/xauth
-	|| ( x11-apps/xbacklight sys-power/acpilight )
-	x11-apps/xcmsdb
-	x11-apps/xcursorgen
-	x11-apps/xdpyinfo
-	x11-apps/xdriinfo
-	x11-apps/xev
-	x11-apps/xf86dga
-	x11-apps/xgamma
-	x11-apps/xhost
-	x11-apps/xinput
-	x11-apps/xkbcomp
-	x11-apps/xkbevd
-	x11-apps/xkbutils
-	x11-apps/xkill
-	x11-apps/xlsatoms
-	x11-apps/xlsclients
-	x11-apps/xmodmap
-	x11-apps/xpr
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xrefresh
-	x11-apps/xset
-	x11-apps/xsetroot
-	x11-apps/xvinfo
-	x11-apps/xwd
-	x11-apps/xwininfo
-	x11-apps/xwud
-	"
-
-# Data
-RDEPEND="${RDEPEND}
-	x11-misc/xbitmaps
-	x11-themes/xcursor-themes
-	"
-
-# Utilities
-RDEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-misc/util-macros
-	"
-
-# Fonts
-RDEPEND="${RDEPEND}
-	fonts? (
-		media-fonts/font-adobe-100dpi
-		media-fonts/font-adobe-75dpi
-		media-fonts/font-adobe-utopia-100dpi
-		media-fonts/font-adobe-utopia-75dpi
-		media-fonts/font-adobe-utopia-type1
-		media-fonts/font-alias
-		media-fonts/font-arabic-misc
-		media-fonts/font-bh-100dpi
-		media-fonts/font-bh-75dpi
-		media-fonts/font-bh-lucidatypewriter-100dpi
-		media-fonts/font-bh-lucidatypewriter-75dpi
-		media-fonts/font-bh-ttf
-		media-fonts/font-bh-type1
-		media-fonts/font-bitstream-100dpi
-		media-fonts/font-bitstream-75dpi
-		media-fonts/font-bitstream-speedo
-		media-fonts/font-bitstream-type1
-		media-fonts/font-cronyx-cyrillic
-		media-fonts/font-cursor-misc
-		media-fonts/font-daewoo-misc
-		media-fonts/font-dec-misc
-		media-fonts/font-ibm-type1
-		media-fonts/font-isas-misc
-		media-fonts/font-jis-misc
-		media-fonts/font-micro-misc
-		media-fonts/font-misc-cyrillic
-		media-fonts/font-misc-ethiopic
-		media-fonts/font-misc-meltho
-		media-fonts/font-misc-misc
-		media-fonts/font-mutt-misc
-		media-fonts/font-schumacher-misc
-		media-fonts/font-screen-cyrillic
-		media-fonts/font-sony-misc
-		media-fonts/font-sun-misc
-		media-fonts/font-util
-		media-fonts/font-winitzki-cyrillic
-		media-fonts/font-xfree86-type1
-
-		media-fonts/font-alias
-		media-fonts/font-util
-		media-fonts/encodings
-	)
-	"
-
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	elog
-	elog "Please note that the xcursors are in ${EROOT%/}/usr/share/cursors/${PN}."
-	elog "Any custom cursor sets should be placed in that directory."
-	elog
-	elog "If you wish to set system-wide default cursors, please create"
-	elog "${EROOT%/}/usr/local/share/cursors/${PN}/default/index.theme"
-	elog "with content: \"Inherits=theme_name\" so that future"
-	elog "emerges will not overwrite those settings."
-	elog
-	elog "Listening on TCP is disabled by default with startx."
-	elog "To enable it, edit ${EROOT%/}/usr/bin/startx."
-	elog
-
-	elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org"
-	elog "for more information on configuring X."
-	elog
-}