gentoo resync : 25.04.2020

10 files changed, 114 insertions, 31 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 7600a4920b18..4d2b57a3da18 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index 775f15059021..ec65b4a84530 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,5 +1,5 @@
 DIST amtk-5.0.1.tar.xz 369192 BLAKE2B b31b60045ea122c814a719877ada69fba3753d33c30ad28b5d0c97cd358ae15d98c8f88c038b95aa64e8d5d9b23e3143b75d571f1dc32dc4178af49b0ecf8faf SHA512 21c581b9ea44bc6e9c13d5c9e6298b55a0f28b1943fab1943d2a8b53a9b82f8c29a983f73e5a4a66a16912645ff8c29023490380d6e6c3de157b9c35f56a4e00
 DIST amtk-5.0.2.tar.xz 368440 BLAKE2B d13498079714612ac775a20032c0684b77c8a2238dad055dba6b87e81c009da22b53cb93df185a10278eedab2857321ee59230488f738064a4fb305345eba345 SHA512 71876430c4e7c19c49170ef6ff8d4c5324f871fd1e02162f33a9249b87f693fa4f4f748ac73d901135d331fee662e5000851e86a00d921da6669319728526136
 EBUILD amtk-5.0.1.ebuild 742 BLAKE2B 9093d129319edfd58f1536b170376cba0219c6b0f198c179263e3a00907259f0e26de663060ad16235d6801f9f6131920ca2f4494719d0a2afe5a9ce5f3c0d50 SHA512 537fa0e30f36410ded96f61afb12a31218c8ade4cdcc7bd635d2913a16170f45903fe5e23e8a2c88fdd50e490a74e7c1b95ef5ebe634329cfcc5e4e939d2c3e4
-EBUILD amtk-5.0.2.ebuild 744 BLAKE2B 5037cbf1f2edc6f193e21aa9196a28c07d9e663c77d74180e9899030daba15eff68da6138250cbeafacdd8da7781b2a4baa906f9d2ce521a46796c3ff747b7b8 SHA512 fe3212751988c4e51490a20f0bbee7328248a3de71ad1d1f27eb15d41716731cee425099d7e5f9b5c5a2087d5efa80cbecc4fed48422aa5c9d4f0987b144d803
+EBUILD amtk-5.0.2.ebuild 742 BLAKE2B 5b5f0f13a882bcbda6586a5758f4adffed5c01417fd4934405e0dd89d60de233fe8c09cb219f0ae9a25843a9b2f860b5876b1b422277b4bdd352b8dca4201077 SHA512 603db580eb621321c544a297d3091cb12283ce093f547611f1c0665c42d736c5bae781f92ad2ce499202dcf0477c4d4540fc49f2835e2a91417ee336828ccac5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gui-libs/amtk/amtk-5.0.2.ebuild b/gui-libs/amtk/amtk-5.0.2.ebuild
index 2b48a6677c9e..3617d3db91f7 100644
--- a/gui-libs/amtk/amtk-5.0.2.ebuild
+++ b/gui-libs/amtk/amtk-5.0.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Amtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 517f41933bd0..9ebb3669505b 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,5 +1,5 @@
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
 DIST libhandy-v0.0.9.tar.bz2 110100 BLAKE2B c1abf60b37d76a0b2f0ed82152decc9a87c9feff664af8df91ede192018a70003ac7ff3c1307668e7196089f59bb5dc21d1449ccc1deb3e2e362f32ff8f9f30b SHA512 d3256c2ff49a7fd0ccfec14ba3e34ed51577841c1670902d25f2a0166e63820428e689c722dddbccf787e1380c7f9a8ddc5b9042a1632b688b151ecce0f6d262
-EBUILD libhandy-0.0.13.ebuild 1526 BLAKE2B bacf74bf16e40ce8b605457adbbc9e900ebbbd82163a6e85221d97b17eb00aaf9cda2c2dfb6411d46ba4459e4c0469d57d62a4ab97a0fbcbbe156bd6caf088c7 SHA512 2864cb11d808f439743bc18c8be6acdd129fc82800cb9344c50248c6eb106b90a262263f34a7dee24761193529815d469f47f8a59450be870ada41475f6b840f
+EBUILD libhandy-0.0.13.ebuild 1524 BLAKE2B 213c411f65be0d25d85624d099ef0f2f5248a979809df66be110f62817c7624e2e19f0b66b0937e449286f16a01c286672cb5886e6c79f96a61a6f25ed3324c5 SHA512 4e8e8756659769f4ccf1464f8b542718549f9d8d7bfa64a04b63f8e724b122fd1fc8bb66bd05ccface82e6f88d291629e31fffb845b89067b94d65eb3e3b0c34
 EBUILD libhandy-0.0.9.ebuild 1524 BLAKE2B 213c411f65be0d25d85624d099ef0f2f5248a979809df66be110f62817c7624e2e19f0b66b0937e449286f16a01c286672cb5886e6c79f96a61a6f25ed3324c5 SHA512 4e8e8756659769f4ccf1464f8b542718549f9d8d7bfa64a04b63f8e724b122fd1fc8bb66bd05ccface82e6f88d291629e31fffb845b89067b94d65eb3e3b0c34
 MISC metadata.xml 474 BLAKE2B b8fba1ac64b79eaadbd70099133bc57a69be78738b9da3742ac9381286f62e5198b5b6dc5bf51dd5a11e0ea06819d3ccc00157f7f69939f18db18016db47705a SHA512 d9c79fbc1e8549dcdf6e42263040844efd729440d725df7c8f06bdf5e6c8da0de8f24186c94a2444e03f4396aaa1e4043d1893996770cfa2e5ea9f1b0ca71b4a
diff --git a/gui-libs/libhandy/libhandy-0.0.13.ebuild b/gui-libs/libhandy/libhandy-0.0.13.ebuild
index 95e3f6e00d7b..1fa76729e3c2 100644
--- a/gui-libs/libhandy/libhandy-0.0.13.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.13.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1+"
 SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
 # SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index e4bc0fdd0cd0..63572b27b891 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,5 +1,7 @@
-AUX wlroots-0.8.1-eglmesaextfix.patch 655 BLAKE2B 94a8e4271037360ee13ebd86852b542426b2a7e7a7bc2df30b74ab57e246b757e7a9ef71f82dc73d7a9c2a352116e13eeddb957c0ca931aad8eb1c9baf729c48 SHA512 2bffe4e80e01902640ec7e585f277a008d3b35568d61a79398659e32fa1aa69b5f9784c3eb931c0851cf1c76f42435887618a14aba0515542ed0b03ebf0eaa42
+AUX wlroots-gcc-10.patch 1020 BLAKE2B a3548355bd2374e590c83b873d1381f76857891aca5372190cf11e5e58bbd5d6909ea204674537bd3c5955cd2ef19d6cc3589dad5520a989dcdcf3ea4a694d07 SHA512 e09695602898104e03a6fa4d05fde2b617ef536460ae0ea1c9a5d35f704fe4d114bc405652f499570593a1b8cc61c5d0bd219bab5529d254f519e73ee23852a1
 DIST wlroots-0.10.0.tar.gz 454540 BLAKE2B 0d2326a62267019001be5f0d79c7b5c937ed20b952c92f0dd8cb04c3a0c06f3ef58723f552b1da1b947ea50ad91df46a543ec9705dad588db800bfa944743d11 SHA512 0e8e0c37f1afb1d99f0ecb3c2282992ffd06381aaa396c7234ead9f3ff2d5c599e766b677680ebaecf68e792054c3e42657d24f32d08bc8bcf35f9eb4bdaa876
-EBUILD wlroots-0.10.0.ebuild 1838 BLAKE2B c383f85f226ccfef6e1bbb010807e686bafa5f928de293511e98c722ff750cbcdf8e3454db0124c5fc95705bdc3cffaab1bb0769b5b7f43511963f7b28e62d0e SHA512 42834ed2a8eb610606cfae6d813f1fb3a6a57f5cf85f6daefd1feb61324d3a32ae7a549f6ceb844414097eb43f05027655b546678ebb0b8fe5d956ee82438167
+DIST wlroots-0.10.1.tar.gz 455232 BLAKE2B 0f4def61d8501b7746ccc589d59586b3641340fb7633b0c4a7b518f1b1b5285c1ee71fb629aa0a0e649c15a4ae69b5cfbc7a034c96e545765a96ddda35f10609 SHA512 e1af5a5b6484b5f4060090e13d22d699d5aaa6926e1a6b1043d2b900f88a002ed67dacf8498f23ed3008bf8a35500f415f95b3dbcf50de5da354f309f9161d58
+EBUILD wlroots-0.10.0.ebuild 1882 BLAKE2B c438d4d1e895ad8c539ccfd69f32a80ceb609b139e2b14929f6e5d173184e01026978531919805b3602530813ecbbc5abe5393933b1fe34bf374b86f830129f5 SHA512 269a1ec002a5e80bc5384833025135eadba865e106009d214fa24271066344d1a8876d7b1832483a78ffdd59f1b2e2d009c26eeee1370027132ddc16bd12ba7b
+EBUILD wlroots-0.10.1.ebuild 1949 BLAKE2B 3e7e878846b1d2911b3fe2f34483757e48c918fe33ecf7b84cd664992b070bbb96a2e1495a85c7e58631231708384116b251ebf4f5c41f1f1820c6090732ae05 SHA512 28a91c1e0c5ed36e4b6f4c47d8f8609b8762936172b5ad22dd464e76041690930b80dbee5af01d4680ad6215af8ef55aa69cea3fc9e2d98b2e2fbbc58859c29e
 EBUILD wlroots-9999.ebuild 1843 BLAKE2B f6e787d25eb5f8eba9d2e89633f81102838ebf66078cfa13a77d0d2ea4f9855296071aa0efb69ca8cb4f90af02c813a2b9e31ca262318240df7464425ed35f55 SHA512 6e7d5fbf03074fea6472cd1ce843778dff9933130dc4ce667124b53db4b84e4eab235215ff6eeedd0f678cf7f630c2a04159c6531bc209bd95c2588ab6f19471
 MISC metadata.xml 1611 BLAKE2B a52787db83324cc424c28255d7a6db05fa6ea7f92f2d5d7cd6ac4121e89f77b9e642be4ecccdb5b75be2f4ac9b1434f98d40743ae86be8044165f70cc59add65 SHA512 b04fbd1afea30e057f0feea17d05195fb76bf872aa80b5d5d6f20ac47a99c08c3703bee65b2352587a6ac588974a7da375228b439c82f861bdefa41537278a99
diff --git a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch
deleted file mode 100644
index 614d0c7a2cd4..000000000000
--- a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d113e48a2a32542fe6e12f1759f07888364609bf Mon Sep 17 00:00:00 2001
-From: Ferdinand Bachmann <theferdi265@gmail.com>
-Date: Sat, 19 Oct 2019 13:33:22 +0200
-Subject: [PATCH] Add missing include required by mesa and libglvnd change
-
-eglext.h no longer inludes eglmesaext.h, include it within wlroots
-explicitly.
-
-Fixes #1862
----
- glgen.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/glgen.sh b/glgen.sh
-index 7324fdf6b..31af28120 100755
---- a/glgen.sh
-+++ b/glgen.sh
-@@ -75,6 +75,7 @@ cat > "$OUTDIR/$BASE.h" << EOF
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <GLES2/gl2.h>
- #include <GLES2/gl2ext.h>
- 
diff --git a/gui-libs/wlroots/files/wlroots-gcc-10.patch b/gui-libs/wlroots/files/wlroots-gcc-10.patch
new file mode 100644
index 000000000000..44e1cb7d89b0
--- /dev/null
+++ b/gui-libs/wlroots/files/wlroots-gcc-10.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/707496
+
+From f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com>
+Date: Tue, 28 Jan 2020 15:27:24 +0100
+Subject: [PATCH] Declare wlr_seat globals as extern
+
+---
+ include/types/wlr_seat.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/types/wlr_seat.h
++++ b/include/types/wlr_seat.h
+@@ -4,9 +4,9 @@
+ #include <wayland-server-core.h>
+ #include <wlr/types/wlr_seat.h>
+ 
+-const struct wlr_pointer_grab_interface default_pointer_grab_impl;
+-const struct wlr_keyboard_grab_interface default_keyboard_grab_impl;
+-const struct wlr_touch_grab_interface default_touch_grab_impl;
++extern const struct wlr_pointer_grab_interface default_pointer_grab_impl;
++extern const struct wlr_keyboard_grab_interface default_keyboard_grab_impl;
++extern const struct wlr_touch_grab_interface default_touch_grab_impl;
+ 
+ void seat_client_create_pointer(struct wlr_seat_client *seat_client,
+ 	uint32_t version, uint32_t id);
diff --git a/gui-libs/wlroots/wlroots-0.10.0.ebuild b/gui-libs/wlroots/wlroots-0.10.0.ebuild
index f408a513a4de..00bde310ba80 100644
--- a/gui-libs/wlroots/wlroots-0.10.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.10.0.ebuild
@@ -47,6 +47,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=("${FILESDIR}"/${PN}-gcc-10.patch)
+
 src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
diff --git a/gui-libs/wlroots/wlroots-0.10.1.ebuild b/gui-libs/wlroots/wlroots-0.10.1.ebuild
new file mode 100644
index 000000000000..49ac9be701a4
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.10.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/10"
+IUSE="elogind icccm systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/libinput-1.9.0:0=
+	>=dev-libs/wayland-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	virtual/pkgconfig
+"
+
+# Patch is in upstream master. Probably drop on 0.10.2 or 0.11.
+PATCHES=("${FILESDIR}"/${PN}-gcc-10.patch)
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dlibcap=$(usex filecaps enabled disabled)
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}