gentoo resync : 15.12.2019

6 files changed, 193 insertions, 84 deletions

diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index b60248d3efa6..a2b928ab177c 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
-DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
-EBUILD libglvnd-1.2.0-r1.ebuild 1131 BLAKE2B 68103807f3f8628064fed57b7c95537b9daf1a2959a06fb6ff2a92037395397e88a5a6dc75140b1bb6d6166ea9719eb42c52dd2a14e0b342622e2b676931c21b SHA512 45a7e3ead4a35a2799b4495b2ab0cf9a5b77560c4d01209bb27ee60dce06a72fdfd590fccbd6cd24d5d3f4e4688d59c10ac95a0d971698496da3c4267981744d
-EBUILD libglvnd-9999.ebuild 1200 BLAKE2B c166dab6fd8fd1f0ab5adab02e9f3e701c1eee437c69fc8f15aadc54fd6edc90384a06dae0414361f0a65ccf9055a0c2db68ddb75f339071988acf64c66ebe5d SHA512 360491fd36d068ab479b8d9d597f802a72c97751d20d354ecf6c1292059b08c7aa8bf9105d23c756dc1adf499c1fce1e8a0277dd643a6324d58d2473bc2c4be1
+AUX libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch 2300 BLAKE2B d4e39da8f901d08e1c5162df928fcb000266e408ad7e7f2a5db711c2afc4802868263b0c82f941ce91f39f5a7ad6c3175013396a0c9fac0c68f6a79f462c8b5a SHA512 d1a0ab923011b93379bff803989f824d91efab378b785862916f12c2fde63c0ff80c4c4bad8d9c6b6a371098fc70d4d08d7d9c5b7fc3069a05c7f91c1b57b428
+AUX libglvnd-1.3.0-meson-Fix-the-armv7-build.patch 1279 BLAKE2B b21502bb309d3d45f51421b9474cb6d4a56a4c0fda637a093d8445de69f79bd36e8f2392d7389c152bf77c7a288ecd37b4c2457e0b86eaefc570a4c63eebffa1 SHA512 6b77410c4370ec7016e43c9be315478f83b8ddc254a3161d3f0e109f640bd1821438539de30ba64e2f599e0869a9cb9a5e01d35f00e0321d49f66733f7a9b3d6
+DIST libglvnd-1.3.0.tar.bz2 713781 BLAKE2B 15014038e8a0f14fc29892354b282535735af0f29e244e4826b945071deec151783fc042f3588add24c31f35a5c72c53bfb1090c109117466f8b8c805cc67356 SHA512 d573fc4a1114be9468afd6e035b3815111f9a7e7453bc2b127c93a1b8a01c7f20440ff8872fbae8fc93aab98862dac3224ceca7f28d02e93f3b9a641d1a248e3
+EBUILD libglvnd-1.3.0.ebuild 1483 BLAKE2B 9a696e1aaa6d2df2354c812bb8913a0138e689946cf76b01bc8ca9c410da14c764c22341f892e679f17e2b9e81996f6811e22b066cf5a0d226b1808b738802ef SHA512 aaa24c1c3b953c18769432b6c588a4019eb39bf6c398e1c2b462e288cb6b85ecc0613fd5377a8bc825f82ef0c042d538692e1271183ced75961988e5788190d1
+EBUILD libglvnd-9999.ebuild 1359 BLAKE2B 45b8f383971986cf55e605a13ce87665b3707c33a00dd7d3d9939b55c7c2b004b3b98bfb85479acde991e0c80a763df6dd4f755926ff4b3d2181f0a609d9d795 SHA512 54368367597cd940948d3c1b966d63bf2107b5bc3cf5328e9c7705d0dfa840793d421003b3551915cb687fefce705f142085cdbea716d6ea19cd3d80fd49bedd
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
new file mode 100644
index 000000000000..51a26c8e0dc8
--- /dev/null
+++ b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
@@ -0,0 +1,54 @@
+From 5ffb8df0ae243f611a0752950443e7a9877e502c Mon Sep 17 00:00:00 2001
+From: Kyle Brenneman <kbrenneman@nvidia.com>
+Date: Fri, 6 Dec 2019 07:27:54 -0700
+Subject: [PATCH 2/2] meson: Fix the PPC64 build.
+
+Check for a cpu_family value of 'ppc64', not 'ppc'. 'ppc' is for 32-bit power.
+
+In GLdispatch, fix the file list for the PPC64 entrypoints.
+---
+ meson.build                          | 4 ++--
+ src/GLdispatch/vnd-glapi/meson.build | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 44c7172..602e837 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,7 @@ if not with_asm.disabled()
+     add_project_arguments('-DUSE_ARMV7_ASM', language : 'c')
+   elif host_machine.cpu_family() == 'aarch64'
+     add_project_arguments('-DUSE_AARCH64_ASM', language : 'c')
+-  elif host_machine.cpu_family() == 'ppc' and host_machine.endian() == 'little'
++  elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
+     add_project_arguments('-DUSE_PPC64LE_ASM', language : 'c')
+   elif with_asm.enabled()
+     error('No ASM available for @0@ (@1@ endian)'.format(host_machine.system(), host_machine.endian()))
+@@ -118,7 +118,7 @@ if use_asm
+   elif host_machine.cpu_family() == 'aarch64'
+     gl_dispatch_type = 'aarch64_tsd'
+   elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
+-    gl_dispatch_type = 'ppc64le_@1@'.format(have_tls ? 'tls' : 'tsd')
++    gl_dispatch_type = 'ppc64le_@0@'.format(have_tls ? 'tls' : 'tsd')
+   endif
+ endif
+ add_project_arguments('-DGLDISPATCH_TYPE_@0@'.format(gl_dispatch_type.to_upper()), language : ['c'])
+diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build
+index ce20178..200d476 100644
+--- a/src/GLdispatch/vnd-glapi/meson.build
++++ b/src/GLdispatch/vnd-glapi/meson.build
+@@ -55,9 +55,9 @@ else
+   elif gl_dispatch_type == 'aarch64_tsd'
+     _entry_files += 'entry_aarch64_tsd.c'
+   elif gl_dispatch_type == 'ppc64le_tls'
+-    _entry_files += 'entry_aarch64_tls.c'
++    _entry_files += 'entry_ppc64le_tls.c'
+   elif gl_dispatch_type == 'ppc64le_tsd'
+-    _entry_files += 'entry_aarch64_tsd.c'
++    _entry_files += 'entry_ppc64le_tsd.c'
+   else
+     error('No matching ASM file for @0@'.format(gl_dispatch_type))
+   endif
+-- 
+2.23.0
+
diff --git a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
new file mode 100644
index 000000000000..e520ae7ff4a8
--- /dev/null
+++ b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
@@ -0,0 +1,36 @@
+From 9ccdb05cdd620c4ae9454010f419d7d11c0efcdc Mon Sep 17 00:00:00 2001
+From: Kyle Brenneman <kbrenneman@nvidia.com>
+Date: Fri, 6 Dec 2019 07:22:40 -0700
+Subject: [PATCH 1/2] meson: Fix the armv7 build.
+
+Fix the GLdispatch meson file so that it checks for the value "armv7_tsd" for
+gl_dispatch_type instead of "arm_tsd".
+---
+ src/GLdispatch/vnd-glapi/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build
+index c5319fc..ce20178 100644
+--- a/src/GLdispatch/vnd-glapi/meson.build
++++ b/src/GLdispatch/vnd-glapi/meson.build
+@@ -39,7 +39,7 @@ if gl_dispatch_type == 'pure_c'
+   _entry_files += 'entry_pure_c.c'
+ else
+   _entry_files += 'entry_common.c'
+-  if gl_dispatch_type != 'arm_tsd'
++  if gl_dispatch_type != 'armv7_tsd'
+     _entry_files += 'entry_simple_asm.c'
+   endif
+   if gl_dispatch_type == 'x86_tls'
+@@ -50,7 +50,7 @@ else
+     _entry_files += 'entry_x86_64_tls.c'
+   elif gl_dispatch_type == 'x86_64_tsd'
+     _entry_files += 'entry_x86_64_tsd.c'
+-  elif gl_dispatch_type == 'arm_tsd'
++  elif gl_dispatch_type == 'armv7_tsd'
+     _entry_files += 'entry_armv7_tsd.c'
+   elif gl_dispatch_type == 'aarch64_tsd'
+     _entry_files += 'entry_aarch64_tsd.c'
+-- 
+2.23.0
+
diff --git a/media-libs/libglvnd/libglvnd-1.2.0-r1.ebuild b/media-libs/libglvnd/libglvnd-1.2.0-r1.ebuild
deleted file mode 100644
index 42b0789af3bf..000000000000
--- a/media-libs/libglvnd/libglvnd-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://github.com/NVIDIA/libglvnd"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="
-	!media-libs/mesa[-libglvnd(-)]
-	!<media-libs/mesa-19.2.2
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	myconf=(
-		$(use_enable X x11)
-		$(use_enable X glx)
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/libglvnd/libglvnd-1.3.0.ebuild b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
new file mode 100644
index 000000000000..948292fe2583
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+VIRTUALX_REQUIRED=manual
+
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
+
+DESCRIPTION="The GL Vendor-Neutral Dispatch library"
+HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S=${WORKDIR}/${PN}-v${PV}
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+RDEPEND="
+	!media-libs/mesa[-libglvnd(-)]
+	!<media-libs/mesa-19.2.2
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-Fix-the-armv7-build.patch
+	"${FILESDIR}"/${P}-meson-Fix-the-PPC64-build.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+		$(meson_feature X glx)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	if use X; then
+		virtx meson_src_test
+	else
+		meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 877b89fb3094..b98a84b1e5a6 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -9,24 +9,28 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+VIRTUALX_REQUIRED=manual
+
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
 
 DESCRIPTION="The GL Vendor-Neutral Dispatch library"
 HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64"
-	COMMIT=""
-	SRC_URI="https://github.com/NVIDIA/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${COMMIT}
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S=${WORKDIR}/${PN}-v${PV}
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X"
+IUSE="test X"
+RESTRICT="!test? ( test )"
 
+BDEPEND="${PYTHON_DEPS}
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 RDEPEND="
 	!media-libs/mesa[-libglvnd(-)]
 	!<media-libs/mesa-19.2.2
@@ -34,28 +38,29 @@ RDEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
 	)"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf
-}
-
 multilib_src_configure() {
-	myconf=(
-		$(use_enable X x11)
-		$(use_enable X glx)
+	local emesonargs=(
+		$(meson_feature X x11)
+		$(meson_feature X glx)
 	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
+	meson_src_configure
 }
 
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
+multilib_src_compile() {
+	meson_src_compile
 }
 
 multilib_src_test() {
-	emake check
+	if use X; then
+		virtx meson_src_test
+	else
+		meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
 }