gentoo resync : 24.06.2021

5 files changed, 58 insertions, 62 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index b29b160fc896..75f9ce9c52c0 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 22ad2185545b..0f174043b754 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,7 +1,5 @@
 AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be74a437841c63844c0716343578b11565a34fb4c534d5908c0b5775305581b68039a6ff9ed7421c9d385a2b7a SHA512 1a611ac0fc2762d94661efc28fa58d57a821185afa7589158d1b8d503bd7361ba1b5029302550134ed1787c2bf90e2ea8afbf3bdefbfe268d8cf13d2f340fb47
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
-DIST egl-wayland-1.1.6.tar.gz 48674 BLAKE2B 66f58d4b841ebaaec6c0711e0dae0b3c774a7b0206f9cfd4d9e94a2c05688d563fddbbf9a60247980df00c3c493147e292bc536e2eb56de962f3b34c6215e026 SHA512 81fd3be3f49ad012efd31189d85666e869653f1f4004de4103f4ad13b7fda036cef432d1e30e33664ae423092dc1b86cfd2773d6542bb09d7a74720ba14e0fa4
 DIST egl-wayland-1.1.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
-EBUILD egl-wayland-1.1.6.ebuild 1660 BLAKE2B a2dc305faacb372b25c49692081f9f8ce3c441405388abc8b231d89703c6e136e53eca1b32770a1d9f3c39a56cb32c13cc07b75fc3c94168bb28fe17e7465383 SHA512 83952f79b5f07f5a709268d37e09e465befa617091e8cd9b6aba1e3208e3441df0ab908cc5366ca9cb8ddafc5ec830d69bad86bcb893ff47077a725a546fe34f
 EBUILD egl-wayland-1.1.7.ebuild 1667 BLAKE2B dd908d257236ced3909795e2cb2b37d08c92aa61ba49ca5ff3180f6079b0f2e5bd4f194b527dc4e3527b2d13914fcb7102c05c80296cd0ed7d885c29c819def3 SHA512 eecdaf683a786a819d76d5726eaf52c46daf27d8a988619426dc12f59f89fc54232b67b44524c21f8dbd1e3fec9ca4837e5a36f2db41b3aaa153ba16e671cbbc
 MISC metadata.xml 328 BLAKE2B 0967a32e5ffc7a996fe48c6cc822e1e2e6efdd7093876ef28256bdc35c292b5216191a786b5592dce818b9aaeaef3f0992f68a369bf36d4ba835d56a6cd786cb SHA512 f06489d4abad797233a1fe8183d3248a4b31c08549c57d59374bceb844566767e0bdddffa88e008e043543f28fd52de3a3dff2692dcde060d8a441e271917aa6
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.6.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.6.ebuild
deleted file mode 100644
index 793b2d29418b..000000000000
--- a/gui-libs/egl-wayland/egl-wayland-1.1.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic meson
-
-DESCRIPTION="EGLStream-based Wayland external platform (for NVIDIA)"
-HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
-SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-libs/wayland
-	!x11-drivers/nvidia-drivers[wayland(-)]"
-DEPEND="
-	${RDEPEND}
-	gui-libs/eglexternalplatform
-	media-libs/libglvnd"
-BDEPEND="dev-util/wayland-scanner"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-werror.patch
-)
-
-src_configure() {
-	# EGLStream is not intended for X11, always build without (bug #777558)
-	append-cppflags -DEGL_NO_X11
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/egl/egl_external_platform.d
-	doins "${FILESDIR}"/10_nvidia_wayland.json
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To use EGLStream with x11-drivers/nvidia-drivers, it is necessary to"
-		elog "load the nvidia-drm module with experimental nvidia-drm.modeset=1."
-		elog
-		elog "Can be accomplished by:"
-		elog "  echo 'options nvidia-drm modeset=1' > ${EROOT}/etc/modprobe.d/nvidia-drm.conf"
-		elog "...then reloading the module."
-		elog
-		elog "Note that EGLStream requires support from the wayland compositor and"
-		elog "is not currently supported by many popular options such as gui-wm/sway."
-	fi
-
-	if has_version "<x11-drivers/nvidia-drivers-391"; then
-		ewarn "<=nvidia-drivers-390.xx may not work properly with this version of"
-		ewarn "egl-wayland, it is recommended to use nouveau drivers for wayland."
-	fi
-}
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 0066afc0610f..4612c3487481 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -2,7 +2,9 @@ AUX 0.0.13-glade3.36-compat1.patch 1655 BLAKE2B fcc6be57b5eea5554e5ba0149fdc6fe9
 AUX 0.0.13-glade3.36-compat2.patch 1879 BLAKE2B d21b874a52028e2b7e4c09da9fb1b97296872a2a7d1665124813a644c9524e56fdeba2afbca218519edf524e91efb76f6182009319e3b098e2464e478b4b5b2d SHA512 c154ee41052dadc97afe99350a08eb141c61dad7201fe2421ae0c27e9cbd5fad8af057e44ae277a2dac9b22d3e1bf945345791bc764783a8bd19448da63bde95
 AUX 0.0.13-glade3.37-compat.patch 7101 BLAKE2B 5c49a13403f5ee41d2aeb99036925c4d94c9174f55abb3f92a27ea631f641d3678caf250319d9199b68506099bab1617013652fa062535d0fc4ec88655394f7e SHA512 8c758b47afe3c0e79c55561a8e93d1ddc3220073659889eba3b0a245f271ef44f35ad8599bdb30ab524102c41b4b344c0debffc5188bc57fcc7d8fee73b73b94
 DIST libhandy-1.2.2.tar.xz 488508 BLAKE2B 1b764c90710de8a7960308b6441657799e6c3a12de9688f720748ca57653f6592fb4ba9f75841d76ae477af7c1709dc4f303658cc543c8de3f6f64d1de7d03cf SHA512 2135d3e15931fa143698de9200803c90e93c87b82c96b4fff90b75075c218a8ef2f69a26210bda8c10fb7195f115b11b804bb6de0b2f65cd464a7cefe35d0af4
+DIST libhandy-1.2.3.tar.xz 491024 BLAKE2B b15e4b12135230ce6e588e005f55edada001abaa3fbdcf2f05b5e05f364beaa8983239f3a562b8600fc07edd6b6b7e834d42a06ec1ec626d7a43d6634ba93d0e SHA512 20ed6708bb517c81d9b8520c522555d7cdaf36f19dd29603a4f86d6d47ec2552af8874605b1866eb634d25afd0a2c18690cb1be6eafce81cac7857890388799e
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
 EBUILD libhandy-0.0.13.ebuild 1641 BLAKE2B fdbb3a2bc50d3ddbbce1bef684846a33b96d73b59bbbe7bbe8f609cd62fefdb4951c949da4c5e50e641a6d473f7e8bf7ee4c102cb24f6691b2eae3cddb3a8e83 SHA512 0ca4f29996d3749799c7e8c55aec00598a14099ac1aff8eb70d374e80ae1be985339080eba22bf19d498131428d1201a16c210f381255e3491bfdd0d7f4d6ace
 EBUILD libhandy-1.2.2.ebuild 1245 BLAKE2B 54b5828a1d8a93caf902fb91b0398bc315e707e12ac211f4f9541bb3fe008f7d1701f3bfec9d841306df9b93b3998be3b1e82f284e05b8bacaa0526e81221328 SHA512 c0a3d0e87fb45b874271695706d5680e2d8f6f521fb62a3896929deda2d810fa094f8e79c62a9f22d14aeea8f74d1d5b0a1dbafc2fa54861f0476f30ad182e0e
+EBUILD libhandy-1.2.3.ebuild 1250 BLAKE2B 2c5ada7d0266a55cb68169de0a8d21049a10ae962bd6f7c80c3acf79cc650c3772531db2a0f455e486bc762d7845851b196b28b49c34914cc86b0ff5f291d910 SHA512 1a1b98c0a7346d0f8f84d86375f52faba3a39e007e910d681f237f13fbe8d4758c4dd39c8100a47d826ef77aa4288d14803de3735317683b1f4816d9e122a5b9
 MISC metadata.xml 353 BLAKE2B 7857afbafa45ea4d3230afa20992cf7196bdd23430ba09bd032b5965b3ce6b7ebadf8122b412549a84d798107adbce3f0b1d6ed79975f315889f7a7700187504 SHA512 f54a7b013a4b5f2e94efda2de95f8063a8755fb2162262a2734ea561fa10cd48be737ddbc3ab7ea93f5d1cf3f59dd91c70da25db5d331828aa74194109c5d36f
diff --git a/gui-libs/libhandy/libhandy-1.2.3.ebuild b/gui-libs/libhandy/libhandy-1.2.3.ebuild
new file mode 100644
index 000000000000..1df7e54eddb4
--- /dev/null
+++ b/gui-libs/libhandy/libhandy-1.2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME apps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="examples glade gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.24.1:3[introspection?]
+	glade? ( dev-util/glade:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofiling=false # -pg passing
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use test tests)
+		$(meson_use examples)
+		$(meson_feature glade glade_catalog)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}