summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--metadata/md5-cache/sys-apps/baselayout-2.13-r4 (renamed from metadata/md5-cache/sys-apps/baselayout-2.13-r3)2
-rw-r--r--metadata/md5-cache/sys-apps/lsb-release-3.2-r2 (renamed from metadata/md5-cache/sys-apps/lsb-release-3.2-r1)2
-rw-r--r--metadata/md5-cache/x11-base/xorg-server-21.1.8-r1018
-rw-r--r--metadata/pkg_desc_index5
-rw-r--r--sys-apps/baselayout/baselayout-2.13-r4.ebuild (renamed from sys-apps/baselayout/baselayout-2.13-r3.ebuild)6
-rw-r--r--sys-apps/baselayout/files/baselayout-2.13-redcore.patch2
-rw-r--r--sys-apps/baselayout/files/baselayout-2.8-redcore.patch39
-rw-r--r--sys-apps/baselayout/files/xorgcfg (renamed from x11-base/xorg-server/files/99-synaptics-overrides.conf)2
-rw-r--r--sys-apps/lsb-release/lsb-release-3.2-r2.ebuild (renamed from sys-apps/lsb-release/lsb-release-3.2-r1.ebuild)4
-rw-r--r--x11-base/xorg-server/Manifest1
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-sets.conf6
-rw-r--r--x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild197
14 files changed, 13 insertions, 377 deletions
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.13-r3 b/metadata/md5-cache/sys-apps/baselayout-2.13-r4
index 3ac9c576..989aefd7 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.13-r3
+++ b/metadata/md5-cache/sys-apps/baselayout-2.13-r4
@@ -12,4 +12,4 @@ RDEPEND=acct-group/smbshare sys-apps/fakeroot !net-fs/sambacfg !sys-boot/grubcfg
SLOT=0
SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.13.tar.bz2
_eclasses_=multilib c19072c3cd7ac5cb21de013f7e9832e0 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c udev eec0bbab06977f1cfc5597269c1fa152
-_md5_=6fb5a985bb02d62cd0d767cef6874bfb
+_md5_=c1bdabf12e133e71aaba1809105bb9bb
diff --git a/metadata/md5-cache/sys-apps/lsb-release-3.2-r1 b/metadata/md5-cache/sys-apps/lsb-release-3.2-r2
index de1c5695..60ba5aba 100644
--- a/metadata/md5-cache/sys-apps/lsb-release-3.2-r1
+++ b/metadata/md5-cache/sys-apps/lsb-release-3.2-r2
@@ -9,4 +9,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/thkukuk/lsb-release_os-release/archive/refs/tags/v3.2.tar.gz -> lsb-release-3.2.tar.gz
_eclasses_=prefix eab3c99d77fe00506c109c8a736186f7
-_md5_=6e63b3083f5ce69852337ba450add99a
+_md5_=08f195ff3e6541b7dd61d8df7800a6e4
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.8-r10 b/metadata/md5-cache/x11-base/xorg-server-21.1.8-r10
deleted file mode 100644
index a0b12d93..00000000
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.8-r10
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
-DESCRIPTION=X.Org X servers
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-INHERIT=flag-o-matic xorg-3 meson
-IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
-RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0/21.1.8
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.8.tar.xz
-_eclasses_=autotools 6ae9a4347149b19a112caa1182d03bde flag-o-matic ad475baa777c9978fa035216c8264a10 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 9d3a9a889a6fa62ae794f817c156491b meson 18d046bdb14e1bdb22cce6e5d953e364 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 python-utils-r1 a013e16d5d896b3d8be68dd2a0e846ea toolchain-funcs 513c31b3346458ed1f3878b57da6d61c xorg-3 94d3e3c20538edd72a65ea18d9a57af4
-_md5_=707fd7e0dfad886612f7ada57f7df543
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index cf8921fd..79b01ead 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -38,9 +38,9 @@ net-dialup/rp-pppoe 4.0-r5: A user-mode PPPoE client and server suite for Linux
net-misc/warpinator 1.4.5: Share files across the LAN
net-print/lexmark-upd-ppd 1.0.0.20210304-r1: Lexmark universal printer driver PPDs
net-wireless/broadcom-sta 6.30.223.271-r4: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
-sys-apps/baselayout 2.13-r3: Filesystem baselayout and init scripts
+sys-apps/baselayout 2.13-r4: Filesystem baselayout and init scripts
sys-apps/firetools 0.9.64: Graphical user interface of app-emulation/firejail
-sys-apps/lsb-release 3.2-r1: LSB version query program
+sys-apps/lsb-release 3.2-r2: LSB version query program
sys-apps/openrc 0.47.1-r1: OpenRC manages the services, startup and shutdown of a host
sys-auth/polkit-qt 0.113.0-r11: PolicyKit Qt API wrapper library (meta package)
sys-auth/polkit-qt5 0.113.0-r5: Qt wrapper around polkit-1 client libraries
@@ -71,7 +71,6 @@ virtual/notification-daemon 1.334.1337: Virtual (dummy package) for notification
virtual/tmpfiles 1.314.1337: Virtual to select between different tmpfiles.d handlers
virtual/udev 314.1337: Virtual to select between different udev daemon providers
x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
-x11-base/xorg-server 21.1.8-r10: X.Org X servers
x11-drivers/nvidia-drivers 390.157-r5 470.199.02-r2 525.125.06-r2 535.54.03-r1: NVIDIA Accelerated Graphics Driver
x11-libs/gtk+ 2.24.33-r3 3.24.37-r1: Gimp ToolKit +
x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities
diff --git a/sys-apps/baselayout/baselayout-2.13-r3.ebuild b/sys-apps/baselayout/baselayout-2.13-r4.ebuild
index a361b3fd..cbfd0b2c 100644
--- a/sys-apps/baselayout/baselayout-2.13-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.13-r4.ebuild
@@ -266,7 +266,7 @@ src_prepare() {
echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
# rc-scripts version for testing of features that *should* be present
- echo "Redcore Linux Hardened - rolling" > etc/redcore-release
+ echo "Redcore Linux Hardened - rolling_boulder_uphill" > etc/redcore-release
}
src_install() {
@@ -340,6 +340,10 @@ src_install() {
insinto /lib/udev/rules.d
newins ${FILESDIR}/ioschedcfg 60-iosched.rules
#
+ # Xorg
+ dodir /usr/share/X11/xorg.conf.d
+ insinto /usr/share/X11/xorg.conf.d
+ newins ${FILESDIR}/xorgcfg 80-synaptics-overrides.conf
##############################################
}
diff --git a/sys-apps/baselayout/files/baselayout-2.13-redcore.patch b/sys-apps/baselayout/files/baselayout-2.13-redcore.patch
index f7bf014f..b3247d17 100644
--- a/sys-apps/baselayout/files/baselayout-2.13-redcore.patch
+++ b/sys-apps/baselayout/files/baselayout-2.13-redcore.patch
@@ -11,7 +11,7 @@ diff -Nur a/Makefile b/Makefile
$(INSTALL_DIR) $(DESTDIR)/usr/lib
ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
- ./make_os_release ${PV} > $(DESTDIR)/usr/lib/os-release
-+ ./make_os_release rolling > $(DESTDIR)/usr/lib/os-release
++ ./make_os_release rolling_boulder_uphill > $(DESTDIR)/usr/lib/os-release
$(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout
cp -pPR share/* $(DESTDIR)/usr/share/baselayout/
ln -snf ../proc/self/mounts $(DESTDIR)/etc/mtab
diff --git a/sys-apps/baselayout/files/baselayout-2.8-redcore.patch b/sys-apps/baselayout/files/baselayout-2.8-redcore.patch
deleted file mode 100644
index ef24e25a..00000000
--- a/sys-apps/baselayout/files/baselayout-2.8-redcore.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur a/Makefile b/Makefile
---- a/Makefile 2021-09-27 22:48:05.000000000 +0100
-+++ b/Makefile 2022-09-21 12:52:08.248406011 +0100
-@@ -63,12 +63,11 @@
- install:
- $(INSTALL_DIR) $(DESTDIR)/etc
- cp -pPR etc/* etc.$(OS)/* $(DESTDIR)/etc/
-- echo "Gentoo Base System release ${PV}" > ${DESTDIR}/etc/gentoo-release
- $(INSTALL_DIR) $(DESTDIR)/lib
- cp -pPR lib.$(OS)/* $(DESTDIR)/lib/
- $(INSTALL_DIR) $(DESTDIR)/usr/lib
- ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
-- ./make_os_release ${OS} ${PV} > $(DESTDIR)/usr/lib/os-release
-+ ./make_os_release ${OS} rolling > $(DESTDIR)/usr/lib/os-release
- $(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout
- cp -pPR share.$(OS)/* $(DESTDIR)/usr/share/baselayout/
-
-diff -Nur a/make_os_release b/make_os_release
---- a/make_os_release 2021-09-27 22:48:05.000000000 +0100
-+++ b/make_os_release 2022-09-21 12:49:21.760390518 +0100
-@@ -4,12 +4,12 @@
- exit 1
- fi
- cat <<EOF
--NAME=Gentoo
--ID=gentoo
--PRETTY_NAME="Gentoo ${1}"
-+NAME=Redcore
-+ID=redcore
-+PRETTY_NAME="Redcore ${1} Hardened"
- ANSI_COLOR="1;32"
--HOME_URL="https://www.gentoo.org/"
--SUPPORT_URL="https://www.gentoo.org/support/"
--BUG_REPORT_URL="https://bugs.gentoo.org/"
-+HOME_URL="https://redcorelinux.org/"
-+SUPPORT_URL="https://wiki.redcorelinux.org/"
-+BUG_REPORT_URL="https://bugs.redcorelinux.org/"
- VERSION_ID="${2}"
- EOF
diff --git a/x11-base/xorg-server/files/99-synaptics-overrides.conf b/sys-apps/baselayout/files/xorgcfg
index ee2a3ebd..deb640fb 100644
--- a/x11-base/xorg-server/files/99-synaptics-overrides.conf
+++ b/sys-apps/baselayout/files/xorgcfg
@@ -1,6 +1,6 @@
# Enable clicks using touchpad (https://bugs.redcorelinux.org/show_bug.cgi?id=48)
-Section "InputClass"
+Section "InputClass"
Identifier "touchpad overrides"
MatchDriver "synaptics"
Option "TapButton1" "1"
diff --git a/sys-apps/lsb-release/lsb-release-3.2-r1.ebuild b/sys-apps/lsb-release/lsb-release-3.2-r2.ebuild
index 785bb114..0357f2a7 100644
--- a/sys-apps/lsb-release/lsb-release-3.2-r1.ebuild
+++ b/sys-apps/lsb-release/lsb-release-3.2-r2.ebuild
@@ -37,7 +37,7 @@ src_install() {
dodir /etc
cat > "${D}/etc/lsb-release" <<- EOF
DISTRIB_ID="Redcore"
- DISTRIB_RELEASE="rolling"
- DISTRIB_DESCRIPTION="Redcore Linux Hardened - rolling"
+ DISTRIB_RELEASE="rolling_boulder_uphill"
+ DISTRIB_DESCRIPTION="Redcore Linux Hardened - rolling_boulder_uphill"
EOF
}
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
deleted file mode 100644
index 4aa30fb7..00000000
--- a/x11-base/xorg-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
deleted file mode 100644
index 57c7349d..00000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
---- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c 2012-09-05 18:26:42.000000000 +0200
-+++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c 2012-09-05 18:28:54.000000000 +0200
-@@ -1109,39 +1109,38 @@
- static void
- RemoveChild(ModuleDescPtr child)
- {
- ModuleDescPtr mdp;
- ModuleDescPtr prevsib;
- ModuleDescPtr parent;
-
- if (!child->parent)
- return;
-
- parent = child->parent;
- if (parent->child == child) {
- parent->child = child->sib;
-- return;
-- }
--
-- prevsib = parent->child;
-- mdp = prevsib->sib;
-- while (mdp && mdp != child) {
-- prevsib = mdp;
-- mdp = mdp->sib;
-+ }
-+ else {
-+ prevsib = parent->child;
-+ mdp = prevsib->sib;
-+ while (mdp && mdp != child) {
-+ prevsib = mdp;
-+ mdp = mdp->sib;
-+ }
-+ if (mdp == child)
-+ prevsib->sib = child->sib;
- }
-- if (mdp == child)
-- prevsib->sib = child->sib;
- child->sib = NULL;
-- return;
- }
-
- void
- LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
- {
- const char *msg;
- MessageType type = X_ERROR;
-
- switch (errmaj) {
- case LDR_NOERROR:
- msg = "no error";
- break;
- case LDR_NOMEM:
diff --git a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
deleted file mode 100644
index 0a611456..00000000
--- a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-See http://lists.x.org/archives/xorg-devel/2015-February/045755.html
-
-diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
-index 849bf92..5cc3ec7 100644
---- a/hw/xfree86/parser/Files.c
-+++ b/hw/xfree86/parser/Files.c
-@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = {
- #define CLEANUP xf86freeFiles
-
- XF86ConfFilesPtr
--xf86parseFilesSection(void)
-+xf86parseFilesSection(XF86ConfFilesPtr ptr)
- {
- int i, j;
- int k, l;
- char *str;
- int token;
-
-- parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec)
-+ if (!ptr) {
-+ if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) {
-+ return NULL;
-+ }
-+ }
-
- while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
- switch (token) {
-diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
-index 171f8e8..e8199fe 100644
---- a/hw/xfree86/parser/configProcs.h
-+++ b/hw/xfree86/parser/configProcs.h
-@@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr);
- int xf86validateDevice(XF86ConfigPtr p);
-
- /* Files.c */
--XF86ConfFilesPtr xf86parseFilesSection(void);
-+XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr);
- void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr);
- void xf86freeFiles(XF86ConfFilesPtr p);
-
-diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c
-index 327c02a..e0d6139 100644
---- a/hw/xfree86/parser/read.c
-+++ b/hw/xfree86/parser/read.c
-@@ -110,7 +110,7 @@ xf86readConfigFile(void)
- if (xf86nameCompare(xf86_lex_val.str, "files") == 0) {
- free(xf86_lex_val.str);
- xf86_lex_val.str = NULL;
-- HANDLE_RETURN(conf_files, xf86parseFilesSection());
-+ HANDLE_RETURN(conf_files, xf86parseFilesSection(ptr->conf_files));
- }
- else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) {
- free(xf86_lex_val.str);
diff --git a/x11-base/xorg-server/files/xorg-sets.conf b/x11-base/xorg-server/files/xorg-sets.conf
deleted file mode 100644
index 5cd8112f..00000000
--- a/x11-base/xorg-server/files/xorg-sets.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Rebuild all X11 modules (mostly useful after xorg-server ABI change).
-[x11-module-rebuild]
-class = portage.sets.dbapi.VariableSet
-world-candidate = false
-variable = CATEGORY
-includes = x11-drivers
diff --git a/x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild b/x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild
deleted file mode 100644
index 4cb12760..00000000
--- a/x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- media-libs/libglvnd[X]
- dev-libs/libbsd
- dev-libs/openssl:0=
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libdrm-2.4.89
- >=x11-libs/libpciaccess-0.12.901
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont2-2.0.1
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/libxshmfence-1.1
- >=x11-libs/pixman-0.27.2
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-2.4.1-r3
- xorg? (
- >=x11-libs/libxcvt-0.1.0
- )
- xnest? (
- >=x11-libs/libXext-1.0.99.4
- >=x11-libs/libX11-1.1.5
- )
- xephyr? (
- x11-libs/libxcb
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- !minimal? (
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)]
- >=media-libs/libepoxy-1.5.4[X,egl(+)]
- )
- udev? ( virtual/libudev:= )
- unwind? ( sys-libs/libunwind:= )
- selinux? (
- sys-process/audit
- sys-libs/libselinux:=
- )
- systemd? (
- sys-apps/dbus
- sys-apps/systemd
- )
- elogind? (
- sys-apps/dbus
- sys-auth/elogind[pam]
- sys-auth/pambase[elogind]
- )
- !!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
- >=x11-base/xorg-proto-2021.4.99.2
- >=x11-libs/xtrans-1.3.5
- media-fonts/font-util
- test? ( >=x11-libs/libxcvt-0.1.0 )
-"
-RDEPEND="${CDEPEND}
- !systemd? ( gui-libs/display-manager-init )
- selinux? ( sec-policy/selinux-xserver )
- xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
- sys-devel/flex
-"
-PDEPEND="
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
- || ( ${IUSE_SERVERS} )
- )
- elogind? ( udev )
- ?? ( elogind systemd )"
-
-UPSTREAMED_PATCHES=(
-)
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
- # needed for new eselect-opengl, bug #541232
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-src_configure() {
- # bug #835653
- use x86 && replace-flags -Os -O2
-
- # localstatedir is used for the log location; we need to override the default
- # from ebuild.sh
- # sysconfdir is used for the xorg.conf location; same applies
- local emesonargs=(
- --localstatedir "${EPREFIX}/var"
- --sysconfdir "${EPREFIX}/etc/X11"
- --buildtype $(usex debug debug plain)
- -Db_ndebug=$(usex debug false true)
- $(meson_use !minimal dri1)
- $(meson_use !minimal dri2)
- $(meson_use !minimal dri3)
- $(meson_use !minimal glamor)
- $(meson_use !minimal glx)
- $(meson_use udev)
- $(meson_use udev udev_kms)
- $(meson_use unwind libunwind)
- $(meson_use xcsecurity)
- $(meson_use selinux xselinux)
- $(meson_use xephyr)
- $(meson_use xnest)
- $(meson_use xorg)
- $(meson_use xvfb)
- -Ddocs=false
- -Ddrm=true
- -Ddtrace=false
- -Dipv6=true
- -Dhal=false
- -Dlinux_acpi=false
- -Dlinux_apm=false
- -Dsecure-rpc=false
- -Dsha1=libcrypto
- -Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
- )
-
- if [[ ${PV} == 9999 ]] ; then
- # Gone in 21.1.x, but not in master.
- emesonargs+=( -Dxwayland=false )
- fi
-
- if use systemd || use elogind; then
- emesonargs+=(
- -Dsystemd_logind=true
- $(meson_use suid suid_wrapper)
- )
- else
- emesonargs+=(
- -Dsystemd_logind=false
- -Dsuid_wrapper=false
- )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # The meson build system does not support install-setuid
- if ! use systemd && ! use elogind; then
- if use suid; then
- chmod u+s "${ED}"/usr/bin/Xorg
- fi
- fi
-
- if ! use xorg; then
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
- "${ED}"/usr/share/man/man1/Xserver.1x || die
- fi
-
- # enable clicks using touchpad (https://bugs.redcorelinux.org/show_bug.cgi?id=48)
- insinto /usr/share/X11/xorg.conf.d
- doins "${FILESDIR}"/99-synaptics-overrides.conf
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postrm() {
- # Get rid of module dir to ensure opengl-update works properly
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
- fi
-}