gentoo resync : 25.09.2021

4 files changed, 4 insertions, 153 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 9d70afe0ff38..d84672ec56a8 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,6 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 AUX weston-pipewire-0.3.patch 11856 BLAKE2B aebe0f4859a0ac3144d8f631fd8b5e35c02f62217ad94106c138aa6095430a2aff7aedf88d67f95991d32e9c728b6704746fedc9858e41e5d99900722b6617ec SHA512 f3e028df4967672c58e1cac66fc8b7781252f15094439dca399d820d945156a15f1e420a8ed062584dcdd7c9577849127aa52974639877796ce91231123bf50d
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-9.0.0-r1.ebuild 3750 BLAKE2B 4616aa581070d1db8c6b0b2db0b7372bb1694b37fc54d55869a4f3c21f918380dbb83b535808fc64637e5b88279916d8236c760640a74d15bc03299a6705356d SHA512 1c31fd9afa7b8ffaf8e1311981675d49f1befe25d45fa07efcc81cde9393dfaa8caa315699d8e07ac90b18550a05ad508241bfc4dfe107ec55772f8e36c14587
-EBUILD weston-9.0.0.ebuild 3755 BLAKE2B de02e57433e44ccc95ef31d8102cc5b7b324046f55cb429d71f0daf34ad2545c8a6692cf0b9051c34333bc7fb4a90c4063fdcc15ab78a3a40195a1f2a9ba5da4 SHA512 f1d838f5f916d5475d8a0335ddbd1185148e9aebd7882915f6acc7697a0582d16645b9f979a365125d6a8947f19b852aad5f5e4f8ab614ea80d47965ef219cfd
-EBUILD weston-9999.ebuild 3753 BLAKE2B b81df5b4510d1968b7804b6d1eac4f766e3dade595169ee913716602b325d75c595dff3ac108c3494a62a69c83662d304a3d4f4b9715a445ea51f25206a60108 SHA512 7c9bd4fc88c9a8c4f06300cfb9da70c8e7c52dc3cdfc75fbf61b0cdde899c484ed576663b4fbe6b8e9388f9dcad82dea62ec16daffbe69e1c4c719490de93ad1
+EBUILD weston-9.0.0-r1.ebuild 3780 BLAKE2B c71c3ccd3f76999517f6e15270fa2a88024753079e058719bd10467d8c3ebbab25efc435c79f9e2097912790edcdd3542ea1597dd0892ca4a1dc96ef2aa11526 SHA512 77a724d1a39a81a1be11d417f7ea0dd398389b57d27975e305e48d3cfe4018b35c209978b104e91a59bccc91254aecf723a478f5a09566e0df47e26cba237001
+EBUILD weston-9999.ebuild 3783 BLAKE2B 6480b821a580b6da0cf52ce48b69c27fba7fea0e37180865316b44a9fca09bd6388bf08a6e32aa3e92e9ce574773d35412d858893edfbb7b0828cac731418176 SHA512 5e4aa8e6a02ef06256b90304b7f18a1a85a50d63bbaface2f086e1e2c59d5e7bfa29bf8c43e3609c99fe270a645a74be9db0791b7c099fb9d9a3c7c3b623c0d9
 MISC metadata.xml 1578 BLAKE2B 302ecc49dda1f6327a73d7dfcae61accf15323cf19e2d4dd322ae54612fa738331614efd044ec148a6bdb3d85895d789c962fad224a5fa88f45f2228421ef089 SHA512 104a8c428651e8c7e4ccdf8332be0af8bf00f3cd36afff301bf5fbd2f446fcc64e9b9ccf3acd636f4e4357a4d4d1ecac0cc747bdfb7089508900abdca5d96bea
diff --git a/dev-libs/weston/weston-9.0.0-r1.ebuild b/dev-libs/weston/weston-9.0.0-r1.ebuild
index 478d276073fd..c10df76c2d83 100644
--- a/dev-libs/weston/weston-9.0.0-r1.ebuild
+++ b/dev-libs/weston/weston-9.0.0-r1.ebuild
@@ -61,6 +61,7 @@ RDEPEND="
 		>=virtual/udev-136
 	)
 	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
deleted file mode 100644
index 9d19b934a222..000000000000
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 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 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}"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms 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? (
-		sys-auth/pambase[systemd]
-		>=sys-apps/dbus-1.6
-		>=sys-apps/systemd-209[pam]
-	)
-	launch? ( 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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-pipewire-0.3.patch
-)
-
-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 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 kiosk shell-kiosk)
-		$(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
-		$(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
-		-Dtest-gl-renderer=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
-}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 8d0a5358b774..bf7a8c00415e 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -61,6 +61,7 @@ RDEPEND="
 		>=virtual/udev-136
 	)
 	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)