gentoo new year resync : 01.01.2021

4 files changed, 124 insertions, 20 deletions

diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 4985a45671f3..fe154d7f82d6 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.18.0.tar.xz 453968 BLAKE2B ee5b3f9dff07fda85b4d64bc753aff28c4a012184eb3a4bae8e3be0fb74324f12e9ea4e3dc049e06a11c7302e3c6b1e53e49109c814381641568d92b5572eed9 SHA512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
-EBUILD wayland-1.18.0.ebuild 1745 BLAKE2B 55810fe6bb4dc95414fa1d51e1b4b6e135aa5b9f0fe160c7f1591276e96507c470867c0ff9a27ac8718a253fd837eeea1563b2b1670cce85088a57403b55d675 SHA512 77b7d0de1af0d77d8a7719e0b16b221bc3640eb5b453983cb8e4193e970865413279f6c4408cc63392c373934428d8f9bad6d43729b0529c9dfceee0ac623143
-EBUILD wayland-9999.ebuild 1717 BLAKE2B 21a7642f0ae18c9e50bac5e57c8515a1a3a366a33ca20077e6a1254b18757a8699c9d011bfa3ab50718c0c434c06c927b0b0586c051f48790d620945d10622b7 SHA512 dc371930037866a40ea11849594bec8b58ef157c3b9853829c07bae99f3e20c7c0aec015c5590308c51e7cd633d8aca7eb84ac6d3b1305ab48c6e32927b29477
+DIST wayland-1.18.91.tar.xz 453500 BLAKE2B 6e234fa637bf4329fcf37c7372e3d02a50742812e2f61477ce302da4c2a1b9377874b0e4e2da899c726ede417081c4d459e40863169352825dd38a8fe0dcf267 SHA512 5ab770c87507e8248aa5197a253f27f3cca984bf1a69c52b438e9aaf512e6b0d841321f81c20643a49ef62eeb6c8b3a6391eadfee5c8822c3cf0d63bb0a8e0f8
+EBUILD wayland-1.18.0.ebuild 1746 BLAKE2B 4877a6996f909af202d7d8f80d638197a0bc305a6ec6de32a01d099fe9133f211f09123889dc779de1b63421921e45a5a7ba656e093b8d0ee8a9c14df0c10b41 SHA512 8843d5f526a0c142658fa22c0f4b771379f5ce3b48516510790914c11815219900b8697a07d18af44cb5103a86e3c756d9244e344abb5d9976ec11d93eb8fd7e
+EBUILD wayland-1.18.91.ebuild 1818 BLAKE2B bfa53844b83b095da346fcdb3307fb4b437a5c90ff463cf87506aad22f963a0bdd94c3d2f256cc6a7f7409d87ab3a8bcf9e834abadd58791ff0616240429015f SHA512 b138f58a8397c07fb2135f43bdc6f293525cf2a8fd91f92509e2ff57102f811196572524804be39591b83aedc291202ebd5a7a0fcd1ca45215b2b9c6a9c382bf
+EBUILD wayland-9999.ebuild 1818 BLAKE2B bfa53844b83b095da346fcdb3307fb4b437a5c90ff463cf87506aad22f963a0bdd94c3d2f256cc6a7f7409d87ab3a8bcf9e834abadd58791ff0616240429015f SHA512 b138f58a8397c07fb2135f43bdc6f293525cf2a8fd91f92509e2ff57102f811196572524804be39591b83aedc291202ebd5a7a0fcd1ca45215b2b9c6a9c382bf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.18.0.ebuild b/dev-libs/wayland/wayland-1.18.0.ebuild
index 2924e39d6f0e..e1e301322771 100644
--- a/dev-libs/wayland/wayland-1.18.0.ebuild
+++ b/dev-libs/wayland/wayland-1.18.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 inherit autotools libtool multilib-minimal toolchain-funcs
 
diff --git a/dev-libs/wayland/wayland-1.18.91.ebuild b/dev-libs/wayland/wayland-1.18.91.ebuild
new file mode 100644
index 000000000000..c3d2b584f4ca
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.18.91.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 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/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+inherit meson multilib-minimal
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="
+	~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP]
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+	)
+"
+DEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(meson_multilib_native_use doc)
+		-Ddtd_validation=$(meson_multilib)
+		-Dlibraries=true
+		-Dscanner=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+src_test() {
+	# We set it on purpose to only a short subdir name, as socket paths are
+	# created in there, which are 108 byte limited. With this it hopefully
+	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/x
+	export XDG_RUNTIME_DIR="${T}"/x
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	multilib-minimal_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index cc89001c551d..c3d2b584f4ca 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -8,9 +8,9 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
-inherit autotools libtool multilib-minimal toolchain-funcs
+inherit meson multilib-minimal
 
 DESCRIPTION="Wayland protocol libraries"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -20,12 +20,12 @@ SLOT="0"
 IUSE="doc"
 
 BDEPEND="
+	~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP]
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.6[dot]
 		app-text/xmlto
 		>=media-gfx/graphviz-2.26.0
-		sys-apps/grep[pcre]
 	)
 "
 DEPEND="
@@ -35,34 +35,51 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(multilib_native_use_enable doc documentation)
-		$(multilib_native_enable dtd-validation)
+	local emesonargs=(
+		-Ddocumentation=$(meson_multilib_native_use doc)
+		-Ddtd_validation=$(meson_multilib)
+		-Dlibraries=true
+		-Dscanner=false
 	)
-	tc-is-cross-compiler && myeconfargs+=( --with-host-scanner )
+	meson_src_configure
+}
 
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+multilib_src_compile() {
+	meson_src_compile
 }
 
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
+multilib_src_test() {
+	meson_src_test
 }
 
 src_test() {
 	# We set it on purpose to only a short subdir name, as socket paths are
 	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
-	export XDG_RUNTIME_DIR="${T}"/xdr
+	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/x
+	export XDG_RUNTIME_DIR="${T}"/x
 	mkdir "${XDG_RUNTIME_DIR}" || die
 	chmod 0700 "${XDG_RUNTIME_DIR}" || die
 
 	multilib-minimal_src_test
 }
+
+multilib_src_install() {
+	meson_src_install
+}