gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 159 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index d876b62f1bbf..addafffcbaa7 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,5 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
-DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
-EBUILD weston-3.0.0-r1.ebuild 3530 BLAKE2B aa846ad8390e827a6762a591d5c1fb7eeaef8c4975f1ad8ca3a08940f4ee9e408ffb85bc5aaf0bf339c370bce574c95c50f703486ae90e4beb67a0cae74cacfb SHA512 84281dcdf6f2cfa35c65f72494782da88eb57cbac5364a2871798b1981afb5256907c3de22deaac35137d677594a35bdc56d157e552bc8ef7193ccbc6a73e538
-EBUILD weston-8.0.0.ebuild 3648 BLAKE2B 00022b8a3b3c8f963207081e4ea3713319b1fc8133d2f3ffd3406d426151050a67e6fa109998be47379015840c67a620a9ebce62d0ad912d5a39fe7402699d5d SHA512 39fc37967659a3f324ab567b8211cb8774d7fb13ef1891512dad82da6535cbf36df6508781432c1e534c4b0978c173ff0cb7794257c0a9e17abde385cb33b1a4
+EBUILD weston-8.0.0.ebuild 3658 BLAKE2B dcc8a38659c697bc4d11f03b7869f216c376b89eae5430e65a53405455d3ea18ac403744c0fddcb83228acfb121136a2be749725f1580dd81755cbfd5a56afa9 SHA512 17432cb183c3b75ea8630ba8453ea72f81d23329e1dd1c2cba524b5773b318307c43631fc42f74616737b3c3c366934f8ed0695d691bd607c79721dceea763ea
 EBUILD weston-9999.ebuild 3675 BLAKE2B 150f27a450bef64d0659dab7fa00fcb8c0dde881a6973cd0b6124da75a4d96b3a167c65fb0a7cd616804f9aecde556991eef856d7955ed30695c4eb4ec044bac SHA512 99ed6f9b3bfa1c06cf627bc2c1b11ae817c3f4e715d44497ecb45bd6ff212257f223570f813451d2412be2a05dcf03919cec9c9b44cac83d2aaed8c40094e785
-MISC metadata.xml 1506 BLAKE2B 7b66fcfbb46edb8480df35f1aabe87c167f02d3cbf505939523248dabadcaab41f395f6ed10eee33c08ee3fbbc2b49d391f61811a75699d4864d6f1eaea3e6fd SHA512 833531fb156a41c3d0996c50e9e72a920b315ad41b7f9a12b82a0f071b621ef9f0b73f8fe2cd63bbce7c1d63d54f41180a3496e3479ef5d0dab725a8af3330dc
+MISC metadata.xml 1440 BLAKE2B 146131404d49bd8011186bced3225a8f12b03e53cc7311baba9f9e412861e7260c50868f169d5dac079319b572cc3996d5565420fdc9972c698df2e5d17ad0ae SHA512 491e0cff4f9e3dc8b794a6711b5ad781c98e72bf5ec851814557b41c2026f8d6cbf39a0342f1564293c093ba87ce23ba7456530213995882098c2bc0f2736217
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index c5e4b9c68897..ef151677e17c 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -20,7 +20,6 @@
 	<flag name="remoting">Enable plugin to stream output to remote hosts using <pkg>media-libs/gstreamer</pkg></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="xwayland">Enable ability support native X11 applications</flag>
 </use>
diff --git a/dev-libs/weston/weston-3.0.0-r1.ebuild b/dev-libs/weston/weston-3.0.0-r1.ebuild
deleted file mode 100644
index 25e9e7ad7e78..000000000000
--- a/dev-libs/weston/weston-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/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/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="amd64 arm x86"
-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 rdp +resize-optimization screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-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.8
-	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.30
-	>=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[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_beta1_p20130710 )
-	systemd? (
-		sys-auth/pambase[systemd]
-		>=sys-apps/systemd-209[pam]
-	)
-	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
-	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}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-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 unwind libunwind) \
-		$(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 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
index c606791b591d..bc3761e35cfe 100644
--- a/dev-libs/weston/weston-8.0.0.ebuild
+++ b/dev-libs/weston/weston-8.0.0.ebuild
@@ -16,10 +16,10 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
+	KEYWORDS="amd64 arm x86"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"