gentoo Easter resync : 12.04.2020

4 files changed, 37 insertions, 46 deletions

diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 65064a6df39c..c0e354b803a2 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,6 +1,7 @@
 AUX waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch 3008 BLAKE2B a81a85ffc11351034454b9f903827a012b0168ed113211e8a1cbab890edebff1baabd1b38a4721f1d4f92d5fb07a17c07e1806139b911be6a35be8ec27333c3e SHA512 ae9f1a6450da0f9a6332762740daf1bcba5740daab4c4fcc952fcebffe36a2d134a72a1a73f58d440a7e520d1065dd6a50ffad3910afb1c74890e7fa692d6d2e
 DIST waffle-1.6.0.tar.xz 224400 BLAKE2B 458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3 SHA512 c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
-EBUILD waffle-1.6.0-r1.ebuild 1796 BLAKE2B 7b0a4cdd7c4501b427d3eded8ac18274990eec700ece56a2c851d94c9925c0e98fc04a0cd03518ec82bdb0e0be162a28a973d01ac0591b9a4e5aef73e9b4bd9b SHA512 7fd407e6cb35db63241f8bc2acfbaa1a759e0a049525160094b5a8c1c9ad7254fdf1fa76af92e3f3e8699378052f490bfbae54258f932026903b6256a7ebfef6
-EBUILD waffle-1.6.0.ebuild 1644 BLAKE2B df24a6ba36c9cde52116a594f6eda58dde0b04dd7e631ce9b289047fe1ec0e8ee5e25be3386006b8fc6add1bc46fa7eaf0d9d84fab7dee2ed774cf89e0b86b6d SHA512 b85123a6a8cc4fdeb19ccc96b783c4f4828b4f51ccc02177f06db67b1489168c5d2bf19f1dd7816e82ac917a2e3a8dae0a6565a491dd177b43ccb6adce16ff28
-EBUILD waffle-9999.ebuild 1704 BLAKE2B f0d6979a1d653cf99799fa7004538aa9331762f57065a8ea61514389b9ed45850300be634d019ed94d104a0c14de979ab35062484c23393eaf89da1c82c6beec SHA512 4fc5c539c6a866fa71dd975ca241042d02e676239b3d4d0e0ddc1bdb86a8ec479d3359af3851e5757942e685a24193456b888996209a50e561e26513081fb494
+DIST waffle-1.6.1.tar.xz 227152 BLAKE2B 360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52 SHA512 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
+EBUILD waffle-1.6.0-r1.ebuild 1785 BLAKE2B 7e9740942befff54b7ed861cb876ccf39d5a3a757a151ca6721d0581a1f5853d7f177e264b5de181aa8ff1e6734d8132e938e745fa5f690b6af31b40ad94fe8f SHA512 5521214b333841d7d22f0b9041b1956422c1aa97425ccc165e488731b08f2dadbfa44c58a9a13542e0348376aac3d9b27e03c96ea80b8bc1351b796695050fbe
+EBUILD waffle-1.6.1-r1.ebuild 1721 BLAKE2B bf494a656e23de505c649ff0dc07caa80b7122f5092478ee89c46f2d76eb61a50865aa6086e458406eb16d39829f1b11a201ab603243883728668cc455c49e81 SHA512 4aee06b4373953bb561572c74d79e3bd57a85ab8b56a71b87b50a5f845ef6d7ac577db2309c965006e9432d1ffe5479de31a3fc094c73428fdb27dd72f5f9377
+EBUILD waffle-9999.ebuild 1622 BLAKE2B 0d2e8656bf04480486f7d9af9832ca92cc53d50dfe415d8470c4ef53702b1ea651fbdef5a28ef39e7850bf2eb8cc691ec4237e31e97df4b3de851cdaf8a0c27b SHA512 386dac3e7c795344683124f747ba3dd10d15f43683a46e71ea6698dcab3d2d6cc4c3f41537d663184d6cd29204df074357aa702789ec3cc6de074190793ebb0c
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild b/media-libs/waffle/waffle-1.6.0-r1.ebuild
index 3a6e37303ecf..50f1ac32ba41 100644
--- a/media-libs/waffle/waffle-1.6.0-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 fi
 inherit meson multilib-minimal ${GIT_ECLASS}
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc egl gbm test wayland X"
+IUSE="doc egl gbm wayland X"
 RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
@@ -56,8 +56,8 @@ multilib_src_configure() {
 		$(meson_feature X x11_egl)
 		$(meson_feature gbm)
 		$(meson_feature egl surfaceless_egl)
-		$(meson_use test build-tests)
 		$(meson_use doc build-manpages)
+		-Dbuild-tests=false
 	)
 	meson_src_configure
 }
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild b/media-libs/waffle/waffle-1.6.1-r1.ebuild
index c1eb3cfd333e..bb76a7df510b 100644
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ b/media-libs/waffle/waffle-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
 	GIT_ECLASS="git-r3"
 else
-	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 inherit meson multilib-minimal ${GIT_ECLASS}
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc egl gbm test wayland X"
+IUSE="doc +egl +gbm wayland X"
 RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
@@ -26,20 +26,23 @@ RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xml-dtd:4.2
-	)
+"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.2
 "
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
 
 multilib_src_configure() {
 	local emesonargs=(
@@ -48,8 +51,8 @@ multilib_src_configure() {
 		$(meson_feature X x11_egl)
 		$(meson_feature gbm)
 		$(meson_feature egl surfaceless_egl)
-		$(meson_use test build-tests)
-		$(meson_use doc build-manpages)
+		-Dbuild-manpages=true
+		-Dbuild-tests=false
 	)
 	meson_src_configure
 }
@@ -58,12 +61,8 @@ multilib_src_compile() {
 	meson_src_compile
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
 multilib_src_install() {
 	meson_src_install
 
-	rm -rf "${D}"/usr/share/doc/waffle1
+	! use doc && rm -rf "${D}"/usr/share/doc/waffle1
 }
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 7a801198f4d6..1786f943ad96 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -7,8 +7,8 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
 	GIT_ECLASS="git-r3"
 else
-	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 inherit meson multilib-minimal ${GIT_ECLASS}
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc egl gbm test wayland X"
+IUSE="doc +egl +gbm wayland X"
 RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
@@ -26,25 +26,20 @@ RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xml-dtd:4.2
-	)
+"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.2
 "
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/wflinfo$(get_exeext)
 )
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature X glx)
@@ -52,8 +47,8 @@ multilib_src_configure() {
 		$(meson_feature X x11_egl)
 		$(meson_feature gbm)
 		$(meson_feature egl surfaceless_egl)
-		$(meson_use test build-tests)
-		$(meson_use doc build-manpages)
+		-Dbuild-manpages=true
+		-Dbuild-tests=false
 	)
 	meson_src_configure
 }
@@ -62,12 +57,8 @@ multilib_src_compile() {
 	meson_src_compile
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
 multilib_src_install() {
 	meson_src_install
 
-	rm -rf "${D}"/usr/share/doc/waffle1
+	! use doc && rm -rf "${D}"/usr/share/doc/waffle1
 }