gentoo resync : 19.03.2019

2 files changed, 40 insertions, 59 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 54c2158566f6..066f9d6d83e2 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -3,5 +3,5 @@ DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0
 DIST weston-5.0.0.tar.xz 1467496 BLAKE2B 514bc4c4f09dc8bc5b068c66cf14b86687bee1e691f7dfcb251a5ae7fe02389b48626ed02c97eff9334b43e227ea8b83beef48c53a83b4691f59a65af53ad61d SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
 EBUILD weston-3.0.0.ebuild 3460 BLAKE2B 3831b7e40fdf6a767a8c4686ce935f6323e1250e9338e7a2e4aaaaa94753098bf28ca3f37e6b05e20eea3feeef3079f889b31f0b44fc66b9be2443b912f8df30 SHA512 3ee0b31c75053f23a0e558a9e83ae737137e24682ef8905c54e2f3437306e6a46137f4300014f9c2471bd7958eb7078c69c8762ea18e79e84d618583b1ad72c6
 EBUILD weston-5.0.0.ebuild 3382 BLAKE2B 78cea378bfb77c2145306ff46b621c18ea814ffcf2a069c2ab7ab85137b38cdc6c01af09be1c0891ddc2742e9967103f5a0505f4da66142c3a99efc71f156c25 SHA512 713f940e5f067270493a06752a6d1d8d051149c196de3b35d86ce5d592964daaca5a192ae17cf94a75f0be959040ca09458db431d97c9f3d3fd563030b2326ee
-EBUILD weston-9999.ebuild 3495 BLAKE2B e51f4a911ffb00a2d573324ba03d1b4207b0a5acedbbdc1804bc3b18055ed20222d61d88e085c7fe28004684885658d130a04f64658da884e828cf14f1587ad1 SHA512 9dc9ab5301ef0f3249dee521dd3231805b8fd40746dd3db5b43b48a9abbdf7cf0aa740ba42cf93603d806f0d2bcca4ee1a349196dc0254549fee533cd77f7aa3
+EBUILD weston-9999.ebuild 3271 BLAKE2B 28633cbd47215e4200355735df23a3f7192f1a4594abed185d6d9101504541fd13c3c4c41379f09426844d711969dcb039f7ef54efeccf9359165bc9f2e4b32b SHA512 7211c5c1b492aae05c49490ebb282f4547aee09e4ac02bc5554eba3b3e8d50710002c54ad3d378928282990f503d74a39c093a92bba9bb547553c07ae74575c7
 MISC metadata.xml 1360 BLAKE2B 0ce06161e748f11ded0baf006473ef73c5fc1f5f63a6554821c8389c65747463808738648b7508c416e6db48f35f290ef8b9e212b91992224dae146ad65cae47 SHA512 d4b17a918dac982654ed9a46e84d6d27b99426a693a23cb93f1b10dd73d7a8cf5bc6d5176a732400c6c1047449ea1a9c3bfb26803ea7247ff0e76c430d676cd1
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 40aa43e4412b..1a039dffa312 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
+inherit meson readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/"
@@ -25,20 +25,19 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +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.14
+	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-protocols-1.17
 	lcms? ( media-libs/lcms:2 )
 	media-libs/libpng:0=
 	webp? ( media-libs/libwebp:0= )
@@ -53,7 +52,6 @@ RDEPEND="
 		>=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
@@ -70,6 +68,7 @@ RDEPEND="
 	)
 	systemd? (
 		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
 		>=sys-apps/systemd-209[pam]
 	)
 	launch? ( sys-auth/pambase )
@@ -88,68 +87,50 @@ 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 remoting) \
-		$(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 \
+	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 X backend-x11)
+		$(meson_use fbdev backend-fbdev)
+		$(meson_use gles2 renderer-gl)
+		$(meson_use launch weston-launch)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use wayland-compositor shell-desktop)
+		$(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)
+		$(usex examples -Dsimple-clients=damage,img,egl,shm,touch "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
 		"${myconf[@]}"
+	)
+	meson_src_configure
 }
 
 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
+	meson_src_test
 }
 
 src_install() {
-	default
-
+	meson_src_install
+	if use launch && use suid; then
+		chmod u+s "${ED}"/usr/bin/weston-launch || die
+	fi
 	readme.gentoo_create_doc
 }