9 files changed, 57 insertions, 331 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 398f14e24754..12a67040c0ac 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 32f84612e436..0787f45f2167 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,10 +9,8 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
-DIST gtk+-3.24.37.tar.xz 12401196 BLAKE2B 1cffcf0066f0f9d42fd01d9cf0dbab2465bf749fe70ebe24a843807c77b696047cbb739fead7f7872833ee562439d96857d02b3037b949babaa3797482104fda SHA512 118521686cb40c5b6ddfcc361be8ff8a16aced2108a24d1f6b7f29d32c235a77774d365b0bd283c9a6873003fca144d67793d12094c74d224a08fc1be341a22f
 DIST gtk+-3.24.38.tar.xz 12398104 BLAKE2B d24e794025d09b01c215ffcc60382f1bb74214b80fbc019bc0fc2a01bd90673c5a9e94b07b6ec981e9b28caf42b8e98032dd8150ac44a9bcab22bae83445685e SHA512 e99ec10959191b55013fce37e83f0e85bf36597db101e324081479792a2047d032cf0d213d69c02eeb4b7cd6d56d6489b7b2a60904b2bd7af23ea1b9c5a79528
 EBUILD gtk+-2.24.33-r3.ebuild 9862 BLAKE2B 45c4a02a17475bae10e983c8965a92ce83cdb1e4673a5ffd6ddeff55cac29499f3b11ae1d07a4502da8158c9a94dc34e6a843653f338fa80483951cf4e747c35 SHA512 39e9d5b5558e29be5d6bc347c6cd05d7c01b156625cecacd46aa9d5eb64b816879993a0f09cd259e5ae6c469584765ad0180155e4baafa91487b93a7013b247d
 EBUILD gtk+-3.24.35.ebuild 6974 BLAKE2B 00529a63525846301d43319c0f73220f56fc79ba038e357edacf50055c235df08272a74782bd1f4bcdbbae4cb6450f39a51c80276ab924409391c0cea6b388ce SHA512 b84c2c6838d7b7dfdeaacc21ebd9b85394a1e559b7a1f658b9585aeb1865dea58cf76d4ad12c8485827bfe8c99880b31149479ea32f81cd4d3c34143ae037546
-EBUILD gtk+-3.24.37.ebuild 5670 BLAKE2B 217b7d405d2ad50601c730b2655d23a27d826e6d0ac1c900dca44444d97d28ddfc1b4af55150f961a8e4cd73dcc3990bc86d505de0575e76daa7abe0931d4de0 SHA512 f8678d3d7d7032966f088e07f225c25ebb121277d6601c8087ff2352a0716be53fe7b00c798d665fe7d0e89eb562df77b816af091fb1a61238d2f4bb80a12682
 EBUILD gtk+-3.24.38.ebuild 5740 BLAKE2B db038ed984aea9e97710433a74322ae2e377816741baff261b9754a67f2350c44d2e40053da2dd6b367d474b4d03475c4dfb3cb5d80fe35fe17bf8706998d240 SHA512 0e139db5ae4e6a32f1f59ae7e31ae804c0ccb9444902b1264125ea197f697d769ece472d8aaed3f64d3ccbe0bad81e2786ea9d20e59d489b2e5a511312326923
 MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e
diff --git a/x11-libs/gtk+/gtk+-3.24.37.ebuild b/x11-libs/gtk+/gtk+-3.24.37.ebuild
deleted file mode 100644
index fd5f7784fdae..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.37.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2 meson-multilib multilib toolchain-funcs virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( X )
-	xinerama? ( X )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.2.0:=
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudproviders? ( net-libs/libcloudproviders[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.21
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		media-libs/libglvnd[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	wayland? ( dev-util/wayland-scanner )
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.3
-		>=dev-util/gtk-doc-1.20
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-PATCHES=(
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	"${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch
-)
-
-src_prepare() {
-	default
-
-	# The border-image-excess-size.ui test is known to fail on big-endian platforms
-	# See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904
-	if [[ $(tc-endian) == big ]]; then
-		sed -i \
-			-e "/border-image-excess-size.ui/d" \
-			-e "/^xfails =/a 'border-image-excess-size.ui'," \
-			testsuite/reftests/meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use aqua quartz_backend)
-		$(meson_use broadway broadway_backend)
-		$(meson_use cloudproviders)
-		$(meson_use examples demos)
-		$(meson_use examples)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool introspection)
-		$(meson_use sysprof profiler)
-		$(meson_use wayland wayland_backend)
-		$(meson_use X x11_backend)
-		-Dcolord=$(usex colord yes no)
-		-Dprint_backends=$(usex cups cups,file,lpr file,lpr)
-		-Dxinerama=$(usex xinerama yes no)
-		# Include backend immodules into gtk itself, to avoid problems like
-		# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-		# user overridden GTK_IM_MODULE envvar
-		-Dbuiltin_immodules=backend
-		-Dman=true
-		$(meson_use test tests)
-		-Dtracker3=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.win32.md that would get installed by default
-	DOCS=( NEWS README.md )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}${cache}" "${ED}${cache}" || die
-		else
-			touch "${ED}${cache}" || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 228db47ba073..8135b5b846e5 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,5 @@
 DIST libxcb-1.15.tar.xz 446492 BLAKE2B d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545 SHA512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9
+DIST libxcb-1.16.tar.xz 452964 BLAKE2B 1ddd5c2e6be8400a0a77db4b5fbd4698996fd1a00984e370b1f712f6b9ce456c8ccfb6992f2973f5eaf8d5b6b75f39b9f51a1458c2432ddb41edd8199b91b3f9 SHA512 002fbc126c6f09eb7db5e4197cd0572d495f64b6de714a76d9a024fe3e13122c1cfc7c55207c0dee76cc63fcccf87b37db513223eadaf760af2bd2a926443bf8
 EBUILD libxcb-1.15-r1.ebuild 1374 BLAKE2B 965d267226e8aec57c83f900f0aee8f47037e2861731047e08b3cbbefd7bafe63ea8b29b1e98675060f01fa3706a7f117a45b3e248d56f97b5cd03cf0e19fd00 SHA512 a806211fdc8c7b9ff9b444d55638e344a7731a3f9ea8d888d6d818c2cd20d9acc2dd476ee469bb32ce28e7d7ea4f29bd05191e3db561c52233c5392057cf5c3a
+EBUILD libxcb-1.16.ebuild 1383 BLAKE2B 8d0a046beb5c302703be4138c2cc13c011a02158d6e5b7ddbd17b2db846d55ed568dac2ce6163f18c47138a7c6697235bb149388c6d921578d25c782995511fe SHA512 cc0b0353a509e01f03f4b71c7cbddd7c12db0e84e77fa536ed1956d90f325b64f49414d52946b9104a771a245a028954aa61c7b69715473b384b9992ace51d44
 MISC metadata.xml 470 BLAKE2B 9f530dabef12ece5a3ccaade8000872e1a89cfef4833ca4d6a4c5e157510516fec18f18e7dbe4ae88ac4059acff9fd099832c3614d12d9742af03167def25f16 SHA512 884ca6cde9de9394a67493b5ec40475873e363ad2530470ebbc0e080f55594bf02787b02960ad172ba05e736c80a6b9c33aa9c2ceaf1b47005f6f47b0895c1a3
diff --git a/x11-libs/libxcb/libxcb-1.16.ebuild b/x11-libs/libxcb/libxcb-1.16.ebuild
new file mode 100644
index 000000000000..398a90536147
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.16.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+XORG_TARBALL_SUFFIX="xz"
+XORG_MULTILIB=yes
+XORG_DOC=doc
+
+inherit python-any-r1 xorg-3
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc selinux test +xkb"
+RESTRICT="!test? ( test )"
+SLOT="0/1.12"
+
+RDEPEND="
+	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	>=x11-base/xcb-proto-1.15.2
+	elibc_Darwin? ( dev-libs/libpthread-stubs )
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '>=x11-base/xcb-proto-1.15[${PYTHON_USEDEP}]')
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-libs/libxslt )
+"
+
+python_check_deps() {
+	python_has_version ">=x11-base/xcb-proto-1.15[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	xorg-3_pkg_setup
+}
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc devel-docs)
+		$(use_enable selinux)
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 41c02bfc5d71..f2a2818dfae2 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,9 +3,7 @@ AUX vte-0.66.2-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2
 DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7
 DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
 DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
-DIST vte-0.72.1.tar.bz2 504271 BLAKE2B 8ab39ab8d491757ab9402ad4bfc10ca733427d2efe895204c0db580e44107a9ab005c29ce2e6934ae27e8da7c27e39d1173fe787ddb8569938a29697eed2e2e1 SHA512 a5655d2d2602183cbda1050003d7cf883e427c8e00976af4ee2685f43530d87169e31a3b9597133d14dffdc95f20f9ca1488186d8463997a2672510f5a95d145
 DIST vte-0.72.2.tar.bz2 503986 BLAKE2B dbd99a1288176482ebe2cee25a1ae508694a8b47739e9c93aa8f752bf50a1f7a6efd0944430550a73224ac92248e2c4738c51eec66a643efc03616dfa7c4b110 SHA512 0510677d67474fb04c69df0038b042d379ac8e1e89b77961e403b854e4a26b2063e93bcffd75ef0a0a324df077cf2f0a4ce51afa0ad0b1e66f707393590af274
 EBUILD vte-0.68.0.ebuild 2701 BLAKE2B 7994a180917976211b25f01b708b6fe421f02217b50c03fed356ed83d27ee411fa6f5624c67d89563105f9eba87a1f7b9e0d341409fc2c89b15c89e90e32c712 SHA512 745efc3f13414f4340a003c6a0e9e77e2063ef20fc7a4132351fd45c73eaa124eb557ff21b6f8baa326e28462628e2a53bd7f6702cc00c2d9945dbed5ee159db
-EBUILD vte-0.72.1.ebuild 3197 BLAKE2B 073dc862b26f3ad1a67ec3ab6be754c98db559df730529ceb7bf1d4339c9bc0b49dc8348c3f75a6d26acd8411932a8e75630199c7872fa8a07121d9b6d6ce6d3 SHA512 0fb28fc2e491ead446787990f01a5b40d18022518aed5b886982bb93ee42c5e371a528c75bc234f7edc2f9af0bf9dc189104c55330032ac81e8f462ceedba4b2
 EBUILD vte-0.72.2.ebuild 3203 BLAKE2B f146c3ece831db2557eacbd9290a9478384648146796ea035df1713c2b7239b3649e8a06dbbca61615ba7f94b2142f2e97d5527e981aae194dbaa606a3a5fb5d SHA512 e7f5278933d9dc8a36707c0ccadc2954b04f736fb397451b147d79ffca66c0b8a35647f5ca7afe82ed853c49a1131a45f91ac32e9441568b070e0d315eb47343
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/x11-libs/vte/vte-0.72.1.ebuild b/x11-libs/vte/vte-0.72.1.ebuild
deleted file mode 100644
index ecadb385d418..000000000000
--- a/x11-libs/vte/vte-0.72.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91"      # vte_api_version in meson.build
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )"
-
-DEPEND="
-	>=x11-libs/gtk+-3.24.22:3[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.60:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21:=
-	systemd? ( >=sys-apps/systemd-220:= )
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
-"
-RDEPEND="${DEPEND}
-	~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
-	if ! use vanilla; then
-		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch
-	fi
-
-	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug debugg)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=true
-		-Dgtk4=false
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte
-	# Remove files that are provided by gui-libs/vte-common
-	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
-	rm "${ED}"/etc/profile.d/vte.sh || die
-	rm "${ED}"/etc/profile.d/vte.csh || die
-	if use systemd; then
-		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
-	fi
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
-	fi
-}
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 1468ef99b48c..246d20dd1145 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,5 +1,3 @@
-DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
 DIST xtrans-1.5.0.tar.xz 170388 BLAKE2B a07dc501a36f4a6d7d9c407c36c5fcaa9555eeec3066d91fa8531118ac04bc55a1fbdce6370782aa8a18e1f26b14e3ad644e1e98ae3a353234e3ecae71fe065b SHA512 e8091f11d4ad2b14e01de3eac56bdf2267ea26687ce66e3056374d0d02e049480c0b27c482f8828a0efd086f1e4c485108ca4dce3f83d66c1896effa3b38b228
-EBUILD xtrans-1.4.0.ebuild 569 BLAKE2B 29b25edbb66a929a9c511350a5f746d9a9c971cfcb19feace86592ae7256b077981c9f864e1f6ceb0ae04c71c62cb6845b9fc2c19239b09f63e4fa56aef5e02d SHA512 0b3c6d7d731692a35e34509a69f7c309923c0c236bb65c97a15d78f1bb9016705b948c4945280323a75cdca067e125f0da80055c37157fdaaf143d4ce812cfda
 EBUILD xtrans-1.5.0.ebuild 594 BLAKE2B 653a510de0f091acb0e9d21750a3c39e091cba44c2d66941e91932fb58720a7e3a958eb8bc855584fabf513f0e79838a89a194425bf3874ea02158aa80b68f7a SHA512 8fa1cf8bdd7ea3dbb099cc8725bc71b7ad26f7d1f8987aaf86aec4a448be641b17c724c799bd4e7f9e0437a39c7087eea8613df50410f075da8ac75a92b5d0de
 MISC metadata.xml 340 BLAKE2B a338aaec9199c9b8d4d7104867c9beab0c1363cf8ae64b4c13366ba1d506a8849c9ace547c8ba8f737e5f0cb6f69a9acc11e4a7ed719bad81da5fb44214d33c4 SHA512 1a1504c0e5788a839e01bb8fa84ac557664af8057690b7dca4528253abbc6355bad2899c492a847ff1c4c938ffb2652c6d34a0b6f6efc2a783080a606ad8323e
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
deleted file mode 100644
index 705221822325..000000000000
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_PACKAGE_NAME="lib${PN}"
-# this package just installs some .c and .h files, no libraries
-XORG_DOC=doc
-inherit xorg-3
-
-DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-3_src_configure
-}