gentoo resync : 28.04.2021

6 files changed, 12 insertions, 241 deletions

diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 0775f8164c40..71c19ff864a6 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,9 +1,4 @@
-AUX waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch 3008 BLAKE2B a81a85ffc11351034454b9f903827a012b0168ed113211e8a1cbab890edebff1baabd1b38a4721f1d4f92d5fb07a17c07e1806139b911be6a35be8ec27333c3e SHA512 ae9f1a6450da0f9a6332762740daf1bcba5740daab4c4fcc952fcebffe36a2d134a72a1a73f58d440a7e520d1065dd6a50ffad3910afb1c74890e7fa692d6d2e
-DIST waffle-1.6.1.tar.xz 227152 BLAKE2B 360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52 SHA512 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
-DIST waffle-v1.6.2.tar.bz2 259740 BLAKE2B 62708dcda7800d2728ea708f88af5e9c3ff5bbeeef653d064c457ebf86620f67d8dfcd934425810ffb66a452814337e3ed13b6f3e8a4d420363a0b66ceeaf2cf SHA512 2b1e153277366731cb5cb3790c6ae1b884efa8e5e0d5a9499a218f1a902370a066e3253f9922297314943aa751596f70a33faff10c2e480ccc1ceace93ccecbf
 DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
-EBUILD waffle-1.6.1-r1.ebuild 1718 BLAKE2B 1e0ee700d4537d3da90f166724b59445e91a2870fafff71c7604fd91c6014001625ae420113583a8635a5ae48ddcd97d480080d938fa8df9287bdd44af9c4a20 SHA512 86a5d9bb19290a5f062c57402de0442d32288876ff21cc2fd6bf1c7a3edaac5660deaa3b2619772e63dcdc2d6fc349dd0f2473e07ace1b775729f43630270489
-EBUILD waffle-1.6.2.ebuild 1826 BLAKE2B ae87f2a7389a4404ce840875ba60e191b918f0717b6f64e0041a92b84a943bf4b8a136593e00da98cf23c5543eee1a3039f2077fae84261dec08f48d688cfbd6 SHA512 c59f5ee9199adbeb822993d3f269b3842111d986b555d08c641c234d12e5fc647c76797ef250d804d5f4029237a115af61c920fe687bf40d2a51263032905b67
-EBUILD waffle-1.7.0.ebuild 1727 BLAKE2B 1ca9dca8d8c9b422ef59653d5146ac40951e07ae33b4e241dcb20e54a6766bca74f239517125c2e64654c211754427e35a53048f9c72d1cb7632a85505b317d4 SHA512 261d7a6b43412c61dea8c2f44bd815c5ebb8ebe3fd1cd3f7602fa5c819d6ef8ebffe6ee17a9413111ff996e1376c7df6e1c026d1edb2f69f48a2f9429d622859
-EBUILD waffle-9999.ebuild 1727 BLAKE2B 1ca9dca8d8c9b422ef59653d5146ac40951e07ae33b4e241dcb20e54a6766bca74f239517125c2e64654c211754427e35a53048f9c72d1cb7632a85505b317d4 SHA512 261d7a6b43412c61dea8c2f44bd815c5ebb8ebe3fd1cd3f7602fa5c819d6ef8ebffe6ee17a9413111ff996e1376c7df6e1c026d1edb2f69f48a2f9429d622859
+EBUILD waffle-1.7.0.ebuild 1700 BLAKE2B f26a5b3174fd77e9ab91c271682a2ce258e92d79c562a3e0f6c858830b27ab897e3a67e36e41f8bf85722b267ae7b65dabe496121f82d8eaa15f46480717ffa0 SHA512 749cd982c751bf23d7bb4d8327491f8416bd3ed54e0864b993f02b01a5652185af34453a635b7e51d4e8b9fafb8151a83677a31554c68aa48ec2200f233cdb15
+EBUILD waffle-9999.ebuild 1700 BLAKE2B f26a5b3174fd77e9ab91c271682a2ce258e92d79c562a3e0f6c858830b27ab897e3a67e36e41f8bf85722b267ae7b65dabe496121f82d8eaa15f46480717ffa0 SHA512 749cd982c751bf23d7bb4d8327491f8416bd3ed54e0864b993f02b01a5652185af34453a635b7e51d4e8b9fafb8151a83677a31554c68aa48ec2200f233cdb15
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
deleted file mode 100644
index ef31275de08e..000000000000
--- a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From b71cfa674db5828a2be04a42ce9996d6677629ee Mon Sep 17 00:00:00 2001
-From: Dylan Baker <dylan@pnwbakers.com>
-Date: Fri, 7 Jun 2019 15:36:09 -0700
-Subject: [PATCH] meson: Generate cmake config and version files if meson is
- new enough
-
-Meson 0.50.0 added a module similar to the pkg-config module for
-generating cmake config files. Since the CMake build system provides
-these the meson build system should as well.
-
-v2: - Bump version to 0.50 instead of incorrect 0.49
-v3: - remove TODO comment that this fixes
-    - Add a definition of set_and_check for meson-generated Config
-      files.
-
-Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
----
- cmake/Modules/WaffleConfig.cmake.in | 10 ++++++++++
- meson.build                         |  2 --
- src/waffle/meson.build              | 20 ++++++++++++++++++++
- 3 files changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/WaffleConfig.cmake.in b/cmake/Modules/WaffleConfig.cmake.in
-index b60b470..4e19755 100644
---- a/cmake/Modules/WaffleConfig.cmake.in
-+++ b/cmake/Modules/WaffleConfig.cmake.in
-@@ -7,6 +7,16 @@
- 
- @PACKAGE_INIT@
- 
-+# This should only be used for meson
-+if (NOT DEFINED set_and_check)
-+    macro(set_and_check _var _file)
-+        set(${_var} "${_file}")
-+        if(NOT EXISTS "${_file}")
-+            message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-+        endif()
-+    endmacro()
-+endif()
-+
- set_and_check(Waffle_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@")
- set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
- set(Waffle_LIBRARIES "@waffle_libname@")
-diff --git a/meson.build b/meson.build
-index 29fda22..22b7f59 100644
---- a/meson.build
-+++ b/meson.build
-@@ -231,5 +231,3 @@ endif
- if get_option('build-examples')
-   subdir('examples')
- endif
--
--# TODO:  CMake config file
-diff --git a/src/waffle/meson.build b/src/waffle/meson.build
-index 322df40..cd68ddf 100644
---- a/src/waffle/meson.build
-+++ b/src/waffle/meson.build
-@@ -211,6 +211,26 @@ pkg.generate(
-   description : 'A library for selecting an OpenGL API and windows system at runtime.',
- )
- 
-+if meson.version().version_compare('>= 0.50')
-+  cmake = import('cmake')
-+  cmake.write_basic_package_version_file(
-+    name : 'Waffle',
-+    version : meson.project_version(),
-+    compatibility : 'SameMajorVersion',
-+  )
-+
-+  cmake_conf = configuration_data()
-+  cmake_conf.set('waffle_libname', waffle_name)
-+  cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')))
-+  cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir')))
-+
-+  cmake.configure_package_config_file(
-+    name : 'Waffle',
-+    input : '../../cmake/Modules/WaffleConfig.cmake.in',
-+    configuration : cmake_conf,
-+  )
-+endif
-+
- if get_option('build-tests')
-   if get_option('default_library') == 'shared'
-     # The unit tests need to poke at internals of the library, but with a
--- 
-2.24.1
-
diff --git a/media-libs/waffle/waffle-1.6.1-r1.ebuild b/media-libs/waffle/waffle-1.6.1-r1.ebuild
deleted file mode 100644
index 6bd3d6db7455..000000000000
--- a/media-libs/waffle/waffle-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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/mesa/${PN}"
-	GIT_ECLASS="git-r3"
-else
-	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}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
-	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=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.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.2
-"
-
-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=(
-		$(meson_feature X glx)
-		$(meson_feature wayland)
-		$(meson_feature X x11_egl)
-		$(meson_feature gbm)
-		$(meson_feature egl surfaceless_egl)
-		-Dbuild-manpages=true
-		-Dbuild-tests=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	! use doc && rm -rf "${D}"/usr/share/doc/waffle1
-}
diff --git a/media-libs/waffle/waffle-1.6.2.ebuild b/media-libs/waffle/waffle-1.6.2.ebuild
deleted file mode 100644
index a1d9e8bbbf26..000000000000
--- a/media-libs/waffle/waffle-1.6.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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/mesa/${PN}"
-	GIT_ECLASS="git-r3"
-else
-	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-	S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
-	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=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.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.2
-"
-
-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=(
-		$(meson_feature X glx)
-		$(meson_feature wayland)
-		$(meson_feature X x11_egl)
-		$(meson_feature gbm)
-		$(meson_feature egl surfaceless_egl)
-		-Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false)
-		-Dbuild-tests=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	! use doc && rm -rf \
-		"${D}"/usr/share/doc/waffle1 \
-		"${D}"/usr/share/man/man{3,7}
-}
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild b/media-libs/waffle/waffle-1.7.0.ebuild
index a3d7588a87d7..1a2174a6add7 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	X? (
+		>=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.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
 "
 BDEPEND="
 	dev-libs/libxslt
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index a3d7588a87d7..1a2174a6add7 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	X? (
+		>=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.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
 "
 BDEPEND="
 	dev-libs/libxslt