12 files changed, 7 insertions, 677 deletions
diff --git a/dev-libs/osformat/Manifest b/dev-libs/osformat/Manifest
index 24e41eb3..fdb634e1 100644
--- a/dev-libs/osformat/Manifest
+++ b/dev-libs/osformat/Manifest
@@ -1 +1 @@
-DIST osformat-1.0.7.tar.xz 248112 SHA512 21dbb20674593623af205a83552c5519a43b4a15ae49ee526c3703d86d80c06c9aa66054736e262b3ddbbdce0de62654ee3758dbc86c26177c82b914b5262064
+DIST osformat-1.0.7.tar.xz 248112 BLAKE2B f7cddeb955b035dccccaa94d97e3674086b8fcc1c9d1fdb548b018d4cf5e468840ae2339bacaedb494c0d95a201bd1920ecc7ef6c6597f48df7b975759c9f033 SHA512 21dbb20674593623af205a83552c5519a43b4a15ae49ee526c3703d86d80c06c9aa66054736e262b3ddbbdce0de62654ee3758dbc86c26177c82b914b5262064
diff --git a/dev-libs/osformat/metadata.xml b/dev-libs/osformat/metadata.xml
index d9944a43..ffe70e9c 100644
--- a/dev-libs/osformat/metadata.xml
+++ b/dev-libs/osformat/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>martin@mvath.de</email>
diff --git a/dev-libs/osformat/osformat-1.0.7.ebuild b/dev-libs/osformat/osformat-1.0.7.ebuild
index 72fb4bad..4a455896 100644
--- a/dev-libs/osformat/osformat-1.0.7.ebuild
+++ b/dev-libs/osformat/osformat-1.0.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2017-2020 Martin V\"ath
+# Copyright 2017-2022 Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 RESTRICT="mirror"
 
 SRC_URI="https://github.com/vaeth/osformat/releases/download/v${PV}/${P}.tar.xz"
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/vaeth/osformat/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-libs/osformat/osformat-999999999.ebuild b/dev-libs/osformat/osformat-999999999.ebuild
index efc9b670..9465d4f6 100644
--- a/dev-libs/osformat/osformat-999999999.ebuild
+++ b/dev-libs/osformat/osformat-999999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2017-2020 Martin V\"ath
+# Copyright 2017-2022 Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit autotools
 
 case ${PV} in
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
deleted file mode 100644
index 9736cc91..00000000
--- a/dev-libs/weston/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST weston-5.0.0.tar.xz 1467496 SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
-DIST weston-8.0.0.tar.xz 1094904 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
diff --git a/dev-libs/weston/files/README.gentoo b/dev-libs/weston/files/README.gentoo
deleted file mode 100644
index ed8c5c3b..00000000
--- a/dev-libs/weston/files/README.gentoo
+++ /dev/null
@@ -1,9 +0,0 @@
-For running Weston you need to have $XDG_RUNTIME_DIR in your environment,
-directory must exist and have correct permissions. If you are not using systemd,
-it will not be created automatically, you can create it using your shell,
-add these lines to ~/.bash_profile:
-
-# wayland
-export XDG_RUNTIME_DIR=/tmp/.runtime-${USER}
-mkdir -p "${XDG_RUNTIME_DIR}"
-chmod 0700 "${XDG_RUNTIME_DIR}"
diff --git a/dev-libs/weston/files/pam-6.0.93.patch b/dev-libs/weston/files/pam-6.0.93.patch
deleted file mode 100644
index 09528755..00000000
--- a/dev-libs/weston/files/pam-6.0.93.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-https://github.com/Freescale/meta-freescale/raw/master/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
-From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require
- PAM
-
-weston-launch requires PAM for starting weston as a non-root user.
-
-Since starting weston as root is a valid use case by itself, if
-PAM is not available, provide a default version of weston-launch
-without non-root-user support.
-
-Patch adapted by Martin Väth <mvath at google.com>
---- 1/libweston/weston-launch.c
-+++ 1/libweston/weston-launch.c
-@@ -51,7 +51,9 @@
- 
- #include <pwd.h>
- #include <grp.h>
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
- 
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -100,8 +102,10 @@
- #endif
- 
- struct weston_launch {
-+#ifdef HAVE_PAM
- 	struct pam_conv pc;
- 	pam_handle_t *ph;
-+#endif
- 	int tty;
- 	int ttynr;
- 	int sock[2];
-@@ -192,6 +196,7 @@
- 	return false;
- }
- 
-+#ifdef HAVE_PAM
- static int
- pam_conversation_fn(int msg_count,
- 		    const struct pam_message **messages,
-@@ -232,6 +237,7 @@
- 
- 	return 0;
- }
-+#endif
- 
- static int
- setup_launcher_socket(struct weston_launch *wl)
-@@ -431,6 +437,7 @@
- 	close(wl->signalfd);
- 	close(wl->sock[0]);
- 
-+#ifdef HAVE_PAM
- 	if (wl->new_user) {
- 		err = pam_close_session(wl->ph, 0);
- 		if (err)
-@@ -438,6 +445,7 @@
- 				err, pam_strerror(wl->ph, err));
- 		pam_end(wl->ph, err);
- 	}
-+#endif
- 
- 	if (ioctl(wl->tty, KDSKBMUTE, 0) &&
- 	    ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -660,6 +668,7 @@
- 	setenv("HOME", wl->pw->pw_dir, 1);
- 	setenv("SHELL", wl->pw->pw_shell, 1);
- 
-+#ifdef HAVE_PAM
- 	env = pam_getenvlist(wl->ph);
- 	if (env) {
- 		for (i = 0; env[i]; ++i) {
-@@ -668,6 +677,7 @@
- 		}
- 		free(env);
- 	}
-+#endif
- 
- 	/*
- 	 * We open a new session, so it makes sense
-@@ -739,8 +749,10 @@
- help(const char *name)
- {
- 	fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-+#ifdef HAVE_PAM
- 	fprintf(stderr, "  -u, --user      Start session as specified username,\n"
- 			"                  e.g. -u joe, requires root.\n");
-+#endif
- 	fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
- 			"                  e.g. -t /dev/tty4, requires -u option.\n");
- 	fprintf(stderr, "  -v, --verbose   Be verbose\n");
-@@ -754,7 +766,9 @@
- 	int i, c;
- 	char *tty = NULL;
- 	struct option opts[] = {
-+#ifdef HAVE_PAM
- 		{ "user",    required_argument, NULL, 'u' },
-+#endif
- 		{ "tty",     required_argument, NULL, 't' },
- 		{ "verbose", no_argument,       NULL, 'v' },
- 		{ "help",    no_argument,       NULL, 'h' },
-@@ -766,11 +780,15 @@
- 	while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
- 		switch (c) {
- 		case 'u':
-+#ifdef HAVE_PAM
- 			wl.new_user = optarg;
- 			if (getuid() != 0) {
- 				fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
- 				exit(EXIT_FAILURE);
- 			}
-+#else
-+			error(1, 0, "-u is unsupported in this weston-launch build");
-+#endif
- 			break;
- 		case 't':
- 			tty = optarg;
-@@ -822,8 +840,10 @@
- 	if (setup_tty(&wl, tty) < 0)
- 		exit(EXIT_FAILURE);
- 
-+#ifdef HAVE_PAM
- 	if (wl.new_user && setup_pam(&wl) < 0)
- 		exit(EXIT_FAILURE);
-+#endif
- 
- 	if (setup_launcher_socket(&wl) < 0)
- 		exit(EXIT_FAILURE);
diff --git a/dev-libs/weston/files/pam-meson.patch b/dev-libs/weston/files/pam-meson.patch
deleted file mode 100644
index 63c4549f..00000000
--- a/dev-libs/weston/files/pam-meson.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# Supplement to pam.patch for meson by Martin Väth <mvath at google.com>
---- 1/libweston/meson.build
-+++ 1/libweston/meson.build
-@@ -472,10 +472,14 @@
- endif
- 
- if get_option('weston-launch')
--	dep_pam = cc.find_library('pam')
-+	dep_pam = systemd_dep
-+	if get_option('pam')
-+		config_h.set('HAVE_PAM', '1')
-+		dep_pam = cc.find_library('pam')
- 
--	if not cc.has_function('pam_open_session', dependencies: dep_pam)
--		error('pam_open_session not found for weston-launch')
-+		if not cc.has_function('pam_open_session', dependencies: dep_pam)
-+			error('pam_open_session not found for weston-launch')
-+		endif
- 	endif
- 
- 	executable(
---- 1/meson_options.txt
-+++ 1/meson_options.txt
-@@ -73,6 +73,13 @@
- )
- 
- option(
-+	'pam',
-+	type: 'boolean',
-+	value: true,
-+	description: 'Use pam for weston-launch'
-+)
-+
-+option(
- 	'xwayland',
- 	type: 'boolean',
- 	value: true,
diff --git a/dev-libs/weston/files/pam.patch b/dev-libs/weston/files/pam.patch
deleted file mode 100644
index ea926f88..00000000
--- a/dev-libs/weston/files/pam.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-https://github.com/Freescale/meta-freescale/raw/master/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
-From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require
- PAM
-
-weston-launch requires PAM for starting weston as a non-root user.
-
-Since starting weston as root is a valid use case by itself, if
-PAM is not available, provide a default version of weston-launch
-without non-root-user support.
-
-Upstream-Status: Pending
-
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---- 1/configure.ac
-+++ 1/configure.ac
-@@ -468,13 +468,17 @@
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
-       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
- 
-+AC_ARG_WITH(pam,
-+            AS_HELP_STRING([--with-pam], [Use PAM]),
-+            [use_pam=$withval], [use_pam=yes])
- AC_ARG_ENABLE(weston-launch, [  --enable-weston-launch],, enable_weston_launch=yes)
- AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes)
--if test x$enable_weston_launch = xyes; then
-+if test x$enable_weston_launch = xyes && test x$use_pam = xyes; then
-   WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no])
-   if test x$have_pam = xno; then
--    AC_ERROR([weston-launch requires pam])
-+    AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found])
-   fi
-+  AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available])
- fi
- 
- AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
-@@ -719,6 +723,7 @@
- 	Enable developer documentation	${enable_devdocs}
- 
- 	weston-launch utility		${enable_weston_launch}
-+	PAM support			${use_pam}
- 	systemd-login support		${have_systemd_login}
- 	systemd notify support		${enable_systemd_notify}
- 
---- 1/libweston/weston-launch.c
-+++ 1/libweston/weston-launch.c
-@@ -52,7 +52,9 @@
- 
- #include <pwd.h>
- #include <grp.h>
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
- 
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -101,8 +103,10 @@
- #endif
- 
- struct weston_launch {
-+#ifdef HAVE_PAM
- 	struct pam_conv pc;
- 	pam_handle_t *ph;
-+#endif
- 	int tty;
- 	int ttynr;
- 	int sock[2];
-@@ -191,6 +195,7 @@
- 	return false;
- }
- 
-+#ifdef HAVE_PAM
- static int
- pam_conversation_fn(int msg_count,
- 		    const struct pam_message **messages,
-@@ -231,6 +236,7 @@
- 
- 	return 0;
- }
-+#endif
- 
- static int
- setup_launcher_socket(struct weston_launch *wl)
-@@ -424,6 +430,7 @@
- 	close(wl->signalfd);
- 	close(wl->sock[0]);
- 
-+#ifdef HAVE_PAM
- 	if (wl->new_user) {
- 		err = pam_close_session(wl->ph, 0);
- 		if (err)
-@@ -431,6 +438,7 @@
- 				err, pam_strerror(wl->ph, err));
- 		pam_end(wl->ph, err);
- 	}
-+#endif
- 
- 	if (ioctl(wl->tty, KDSKBMUTE, 0) &&
- 	    ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -610,6 +618,7 @@
- 	setenv("HOME", wl->pw->pw_dir, 1);
- 	setenv("SHELL", wl->pw->pw_shell, 1);
- 
-+#ifdef HAVE_PAM
- 	env = pam_getenvlist(wl->ph);
- 	if (env) {
- 		for (i = 0; env[i]; ++i) {
-@@ -618,6 +627,7 @@
- 		}
- 		free(env);
- 	}
-+#endif
- 
- 	/*
- 	 * We open a new session, so it makes sense
-@@ -685,8 +695,10 @@
- help(const char *name)
- {
- 	fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-+#ifdef HAVE_PAM
- 	fprintf(stderr, "  -u, --user      Start session as specified username,\n"
- 			"                  e.g. -u joe, requires root.\n");
-+#endif
- 	fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
- 			"                  e.g. -t /dev/tty4, requires -u option.\n");
- 	fprintf(stderr, "  -v, --verbose   Be verbose\n");
-@@ -700,7 +712,9 @@
- 	int i, c;
- 	char *tty = NULL;
- 	struct option opts[] = {
-+#ifdef HAVE_PAM
- 		{ "user",    required_argument, NULL, 'u' },
-+#endif
- 		{ "tty",     required_argument, NULL, 't' },
- 		{ "verbose", no_argument,       NULL, 'v' },
- 		{ "help",    no_argument,       NULL, 'h' },
-@@ -712,9 +726,13 @@
- 	while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
- 		switch (c) {
- 		case 'u':
-+#ifdef HAVE_PAM
- 			wl.new_user = optarg;
- 			if (getuid() != 0)
- 				error(1, 0, "Permission denied. -u allowed for root only");
-+#else
-+			error(1, 0, "-u is unsupported in this weston-launch build");
-+#endif
- 			break;
- 		case 't':
- 			tty = optarg;
-@@ -755,8 +773,10 @@
- 	if (setup_tty(&wl, tty) < 0)
- 		exit(EXIT_FAILURE);
- 
-+#ifdef HAVE_PAM
- 	if (wl.new_user && setup_pam(&wl) < 0)
- 		exit(EXIT_FAILURE);
-+#endif
- 
- 	if (setup_launcher_socket(&wl) < 0)
- 		exit(EXIT_FAILURE);
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
deleted file mode 100644
index 661f699a..00000000
--- a/dev-libs/weston/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="colord">Allow setting color managment</flag>
-	<flag name="drm">Enable drm compositor support</flag>
-	<flag name="editor">Install wayland-editor example application</flag>
-	<flag name="fbdev">Enable fbdev compositor support</flag>
-	<flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
-	<flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
-	<flag name="ivi">Enable the IVI shell</flag>
-	<flag name="launch">Install weston-launch utility</flag>
-	<flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
-	<flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
-	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
-	<flag name="unwind">Enable libunwind usage for backtraces</flag>
-	<flag name="wayland-compositor">Enable Wayland compositor support</flag>
-	<flag name="webp">Add support for the WebP image format</flag>
-	<flag name="xwayland">Enable ability support native X11 applications</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-libs/weston/weston-5.0.0-r1.ebuild b/dev-libs/weston/weston-5.0.0-r1.ebuild
deleted file mode 100644
index 14db5669..00000000
--- a/dev-libs/weston/weston-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms pam rdp +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	systemd? ( dbus )
-	test? ( headless xwayland )
-	wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.12.0
-	>=dev-libs/wayland-protocols-1.13
-	lcms? ( media-libs/lcms:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.68
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( >=sys-apps/dbus-1.6 )
-	drm? (
-		>=media-libs/mesa-17.1[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? ( >=net-misc/freerdp-1.1.0:= )
-	systemd? (
-		pam? ( sys-auth/pambase[systemd] )
-		>=sys-apps/systemd-209[pam?]
-	)
-	launch? ( pam? ( sys-auth/pambase ) )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	eapply "${FILESDIR}"/pam.patch
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use examples || use test; then
-		myconf+=( --enable-simple-clients )
-	else
-		myconf+=( --disable-simple-clients )
-	fi
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable lcms) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable gles2 egl) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable systemd systemd-login) \
-		$(use_enable systemd systemd-notify) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		$(use_with jpeg) \
-		$(use_with pam) \
-		$(use_with webp) \
-		--with-cairo=image \
-		--disable-junit-xml \
-		--disable-simple-dmabuf-drm-client \
-		--disable-simple-dmabuf-v4l-client \
-		--disable-simple-egl-clients \
-		--disable-vaapi-recorder \
-		"${myconf[@]}"
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	emake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-8.0.0.ebuild b/dev-libs/weston/weston-8.0.0.ebuild
deleted file mode 100644
index 755eb450..00000000
--- a/dev-libs/weston/weston-8.0.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pam pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	colord? ( lcms )
-	drm? ( gles2 )
-	pipewire? ( drm )
-	screen-sharing? ( rdp )
-	test? ( desktop headless xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm fbdev headless rdp wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.18
-	lcms? ( media-libs/lcms:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.68
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	drm? (
-		>=media-libs/mesa-17.1[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	pipewire? ( >=media-video/pipewire-0.2 )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? (
-		pam? ( sys-auth/pambase[systemd] )
-		>=sys-apps/dbus-1.6
-		>=sys-apps/systemd-209[pam?]
-	)
-	launch? ( pam? ( sys-auth/pambase ) )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[X,xcb(+)]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	eapply "${FILESDIR}"/pam-6.0.93.patch
-	eapply "${FILESDIR}"/pam-meson.patch
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		$(meson_use fbdev backend-fbdev)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use launch weston-launch)
-		$(meson_use pam)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use colord color-management-colord)
-		$(meson_use systemd launcher-logind)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		-Dsimple-dmabuf-drm=auto
-		$(meson_use examples demo-clients)
-		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-
-	# devices test usually fails.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Fxv devices) || die
-}
-
-src_install() {
-	meson_src_install
-	if use launch && use suid; then
-		chmod u+s "${ED}"/usr/bin/weston-launch || die
-	fi
-	readme.gentoo_create_doc
-}