6 files changed, 2 insertions, 224 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index bb75d0432879..d56b1640d9d9 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index b211ab759487..25ccfb703049 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,6 +1,4 @@
-DIST dunst-1.9.0.tar.gz 4609222 BLAKE2B 4879122e342c1e518bca079bacd4ae769fd7da41db681230613c61531e62df94223757372c428c06710afd843200dcb78883d352f4e25098f0672b5c89ab0d87 SHA512 e43c960561d1f804c1d8f73f9376b33f61bf1ba5c5d0579c9875ef96da6522e214d5b74166ca3375dff1b4b0291b611b2d9ac1fb41fa8722db04c21e898824d1
 DIST dunst-1.9.1.tar.gz 4614410 BLAKE2B f2d3b5ca28ac74461e31c09f7c5f8369dd6d05e8133d184625344b5445fac8e673cf5c57d44ea8bf0f3d320167663529ea49e8de0ed873afae327cb7db55d5ff SHA512 6045529196c2d8bd89d2976db9712bf15ec75923fdab414870e1ae2af2eb87afc2b5886cb707a19ea113ec746f90fde1e52631eec9b7a96f1af03acbe6445f32
-EBUILD dunst-1.9.0.ebuild 1593 BLAKE2B 74799c0e1bc5b2744fceeb7abb7cdd3c184676645d25efadc95a0ab2b2160322bc678aa379deeda7e3db96a1a128762a108a69e2f327e38a9592a0c547b2cb06 SHA512 3a86fa252c453dff714be3982a9d73386dd2b0e7caf08a06d8ec48b97a598562aacb77b76da23477e06fdedc0e36a4f0a6bc0263e32e01da2a4353da83fb4dd0
-EBUILD dunst-1.9.1.ebuild 1717 BLAKE2B 062fee96e7e193c518e87422ef1eeec553bd921397fc9a6964af44cf3d3bf04922e3ecbe58f1ba6e714b7cc26d915e5d2f3fc81f8d7eec2581001ec15d92b271 SHA512 aa7a021aa47afccedbda04d92e7a95719fc9456f9d720ef7e0ae202f66a8648315aa9f5a7dadb57bd675ed9f2e0edfa298d5d550fac37acd101ed2a95cba1bfa
+EBUILD dunst-1.9.1.ebuild 1715 BLAKE2B 3b9208e105c31b2f70ce48198fbfe707291ccd29d89c049a91e9331fb0351186a4a59755f77dbe0d2b8b70063032fca7f2434855743a6f421875715d28fe5f46 SHA512 bf0fba1d98d126ea3fc287d6fbe702bbf9e20db1122fd7d40d86ecb0a0f04a558621d678995e90f199ea7b2864afdce4341ca2f937c5e856fe1574f74f953051
 EBUILD dunst-9999.ebuild 1565 BLAKE2B 600eb84737690daa8ed7557251e6214331d031a1cf99ebbfa821c135d9064f47cfd2a47afb04feeb8dbb5512f7c062ab19358a76539cd22be35649a0c035b6ef SHA512 a89b6f5f134fd5564b936fdd514033e8a187a5ff2b833802b353f0c14f7596216408b3eb454a90d525ae1313e6ee3295394480ad781ea833d05d04c1aa7f8804
 MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
diff --git a/x11-misc/dunst/dunst-1.9.0.ebuild b/x11-misc/dunst/dunst-1.9.0.ebuild
deleted file mode 100644
index 37336b25c793..000000000000
--- a/x11-misc/dunst/dunst-1.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Lightweight replacement for common notification daemons"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland"
-
-DEPEND="
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/cairo[X,glib]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXScrnSaver
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libnotify
-	x11-libs/pango[X]
-	x11-misc/xdg-utils
-	wayland? ( dev-libs/wayland )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	wayland? ( dev-libs/wayland-protocols )
-"
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os//' -i config.mk || die
-
-	# Use correct path for dbus and system unit
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	default
-}
-
-src_compile() {
-	local myemakeargs=(
-		SYSCONFDIR="${EPREFIX}/etc/xdg"
-		SYSTEMD="0"
-		WAYLAND="$(usex wayland 1 0)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		PREFIX="${ED}/usr"
-		SYSCONFDIR="${ED}/etc/xdg"
-		SYSTEMD="0"
-		WAYLAND="$(usex wayland 1 0)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	systemd_newuserunit dunst.systemd.service.in dunst.service
-}
diff --git a/x11-misc/dunst/dunst-1.9.1.ebuild b/x11-misc/dunst/dunst-1.9.1.ebuild
index 2414b563605b..f054ef05620c 100644
--- a/x11-misc/dunst/dunst-1.9.1.ebuild
+++ b/x11-misc/dunst/dunst-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 DEPEND="
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index eac46dd2d655..b324b0009594 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,7 +2,6 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
-AUX virtualgl-3.0.1-libX11-1.8.patch 4857 BLAKE2B b37e84af828c4d7e37a9ec424aa92dc25330be9362f0c7bdc2624eac0898d5995be1647c690b2b7be9e656747785325aed961ea11ef5f653ea05ab44b4b3e4d7 SHA512 f17715b21f91439675981d2e6dad635cccbb36ddc012f037ff9d0859a21179f6881aac1ad7f5630e2311146bec7b10284bad982986b1e2f43beb3b24a0a8796b
 DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4 SHA512 fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
 DIST VirtualGL-3.1.tar.gz 1248818 BLAKE2B 556e2a05811b89ddfecc371d75888f09c7a59bb2c7e3f265eae4631627cf3e586114735b2616cd6292fbcea089e81326736013a7b1d47ad1746365e72e313627 SHA512 cd1109b4dee426918e61348b22b3bfb0c45102bbb0bcde9b78c36b607a396bbff7d7c72cf3bf9626128da0f1776c42bbb59be863239e60e0f7307d2a73de463b
 EBUILD virtualgl-3.0.2.ebuild 2862 BLAKE2B 6f72164ed90b1092c1571477f09ccbecf7bbcbe389ec8ed246fd285d7f8796bd0bf1486a834044c14d0d014f02dc53ddf099acf50a0db2d84068ec92f2070837 SHA512 d2cbe9ba3fe6107966cbe855d5536a0ad70ffbbb646d4bf9b5ca86a14c81b3ff296cf9bd72d8ce5de3704edceef68b31593b0987fbb81aa3e51c5c3650c34c9d
diff --git a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
deleted file mode 100644
index dd37d6c3b664..000000000000
--- a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 46d09529563127fef0d42a4fb2681ae8d65a856b Mon Sep 17 00:00:00 2001
-From: DRC <information@virtualgl.org>
-Date: Thu, 7 Jul 2022 17:22:57 -0500
-Subject: [PATCH] Build: Fix compilation errors with libX11 1.8.x
-
-Fixes #205
----
- ChangeLog.md           |  2 ++
- server/CMakeLists.txt  | 10 ++++++++++
- server/FakePbuffer.cpp |  2 +-
- server/faker-sym.h     |  6 ++++++
- server/faker-x11.cpp   |  7 ++++++-
- server/faker.cpp       |  4 ++--
- 6 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 292a5a94..4b9cc36f 100644
---- a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -8,6 +8,8 @@ module when using recent versions of nVidia's proprietary drivers.  In some
- cases, this led to incorrect device permissions for **/dev/nvidia*** after the
- display manager was restarted.
- 
-+2. Fixed compilation errors when building with libX11 1.8.x.
-+
- 
- 3.0.1
- =====
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 574521a0..2ce92856 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -91,6 +91,16 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
- 		> ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
- 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/faker-mapfile.c)
- 
-+include(CheckPrototypeDefinition)
-+set(CMAKE_REQUIRED_INCLUDES ${X11_X11_INCLUDE_PATH})
-+check_prototype_definition(XkbOpenDisplay
-+	"Display *XkbOpenDisplay(_Xconst char *, int *, int *, int *, int *, int *)"
-+	NULL X11/XKBlib.h LIBX11_18)
-+unset(CMAKE_REQUIRED_INCLUDES)
-+if(LIBX11_18)
-+	add_definitions(-DLIBX11_18)
-+endif()
-+
- set(FAKER_SOURCES
- 	backend.cpp
- 	ContextHash.cpp
-diff --git a/server/FakePbuffer.cpp b/server/FakePbuffer.cpp
-index bfa55279..64aab775 100644
---- a/server/FakePbuffer.cpp
-+++ b/server/FakePbuffer.cpp
-@@ -10,11 +10,11 @@
- // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- // wxWindows Library License for more details.
- 
-+#include <X11/Xlibint.h>
- #include "FakePbuffer.h"
- #include "TempContextEGL.h"
- #include "BufferState.h"
- #include "ContextHashEGL.h"
--#include <X11/Xlibint.h>
- 
- using namespace util;
- using namespace backend;
-diff --git a/server/faker-sym.h b/server/faker-sym.h
-index 0fa1e5cd..3c6f94e8 100644
---- a/server/faker-sym.h
-+++ b/server/faker-sym.h
-@@ -704,9 +704,15 @@ FUNCDEF2(int, XNextEvent, Display *, dpy, XEvent *, xe, XNextEvent)
- 
- FUNCDEF1(Display *, XOpenDisplay, _Xconst char *, name, XOpenDisplay)
- 
-+#ifdef LIBX11_18
-+FUNCDEF6(Display *, XkbOpenDisplay, _Xconst char *, display_name,
-+	int *, event_rtrn, int *, error_rtrn, int *, major_in_out,
-+	int *, minor_in_out, int *, reason_rtrn, XkbOpenDisplay)
-+#else
- FUNCDEF6(Display *, XkbOpenDisplay, char *, display_name, int *, event_rtrn,
- 	int *, error_rtrn, int *, major_in_out, int *, minor_in_out,
- 	int *, reason_rtrn, XkbOpenDisplay)
-+#endif
- 
- FUNCDEF5(Bool, XQueryExtension, Display *, dpy, _Xconst char *, name,
- 	int *, major_opcode, int *, first_event, int *, first_error,
-diff --git a/server/faker-x11.cpp b/server/faker-x11.cpp
-index 99e8bf17..a233f3b1 100644
---- a/server/faker-x11.cpp
-+++ b/server/faker-x11.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011-2016, 2018-2021 D. R. Commander
-+// Copyright (C)2009, 2011-2016, 2018-2022 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -586,8 +586,13 @@ Display *XOpenDisplay(_Xconst char *name)
- // within libX11, VirtualGL cannot intercept it on some platforms.  Thus we
- // need to interpose XkbOpenDisplay().
- 
-+#ifdef LIBX11_18
-+Display *XkbOpenDisplay(_Xconst char *display_name, int *event_rtrn,
-+	int *error_rtrn, int *major_in_out, int *minor_in_out, int *reason_rtrn)
-+#else
- Display *XkbOpenDisplay(char *display_name, int *event_rtrn, int *error_rtrn,
- 	int *major_in_out, int *minor_in_out, int *reason_rtrn)
-+#endif
- {
- 	Display *dpy = NULL;
- 
-diff --git a/server/faker.cpp b/server/faker.cpp
-index ec537a62..601cfa3e 100644
---- a/server/faker.cpp
-+++ b/server/faker.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011, 2013-2016, 2019-2021 D. R. Commander
-+// Copyright (C)2009, 2011, 2013-2016, 2019-2022 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -14,6 +14,7 @@
- 
- #include <unistd.h>
- #include "Mutex.h"
-+#include <X11/Xlibint.h>
- #include "ContextHash.h"
- #ifdef EGLBACKEND
- #include "ContextHashEGL.h"
-@@ -27,7 +28,6 @@
- #include "fakerconfig.h"
- #include "threadlocal.h"
- #include <dlfcn.h>
--#include <X11/Xlibint.h>
- #include "faker.h"
- 
-