gentoo (leap year) resync : 29.02.2020

6 files changed, 4 insertions, 131 deletions

diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 4c9e131fb3fd..76a6f604e1f9 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,7 +1,4 @@
-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
-AUX libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch 996 BLAKE2B cd1d29e2a7bf48669b87c630a165f35f5f27a8a31cd664fb7cb1e4df4240151d6b48820d0d32de5dc3f352888e92c00e4eb29610cf58d5f61b19da1e100422d0 SHA512 e55ed7dba293d4366fbf24a4b6711d56038cdf39f7aea7aefa0d191563ca0ae1e8c0850a8181b0e315aa986804ba641373c6f7665bfc08d571fcd4c15b77b3fe
-DIST libglvnd-1.3.0.tar.bz2 713781 BLAKE2B 15014038e8a0f14fc29892354b282535735af0f29e244e4826b945071deec151783fc042f3588add24c31f35a5c72c53bfb1090c109117466f8b8c805cc67356 SHA512 d573fc4a1114be9468afd6e035b3815111f9a7e7453bc2b127c93a1b8a01c7f20440ff8872fbae8fc93aab98862dac3224ceca7f28d02e93f3b9a641d1a248e3
-EBUILD libglvnd-1.3.0.ebuild 1579 BLAKE2B efec0a225b9655c64c4fa1e9951d203ad2884ed05376b4b7d28e88fa537d65b3c2cd23c26a22d730474590312d0fd94226ed2f002ccf7e914656d8d2443933fa SHA512 50c3d8a79b7d10e67893c3bc127c1a8f5cfe05651fd01d71e02baf2fa663d278e31bbcd83610e6dbfb180b78c6400d1551ff33124c89b611718b7586a2dd1e1e
-EBUILD libglvnd-9999.ebuild 1378 BLAKE2B b7768837f805d81b881b756cb7a955296e63b9d6a2fa79b7df8360920d56b949e6e5a8e8ec9b02d4c18f26cda2a87df2d90f8610b1f1ee790f940dfba5210ce2 SHA512 1476d7e60692f2d5feab1ae648977e1e58f25069023e803539a8f3d0951bebb0d7e09e0e4488ffe91ec7d3635258223b32ed51455a839fa0ec1e033761a11924
+DIST libglvnd-1.3.1.tar.bz2 714436 BLAKE2B 31b91f678b0335a7db3e697129dabd157c37fee0ec0f81f7d0be68ffcf9d6be2989a929f7b1fb87b505168ab4a3cc07b4cecf103f1d5a2a3b866eedb5a3a494b SHA512 99bbe8447f7791c8a4b2ab4e9f3067309ea3ffb9a042b0b5e80d1eac7e6e36af8b5ec56ec3266f34343d705521827956f2fdca27be386f40e130cec300e8342c
+EBUILD libglvnd-1.3.1.ebuild 1384 BLAKE2B f327ec99b7e0c620dcccad15a40c2afdbe0b94fde4ea787426cbe01b0664d8d2549cbbee9d871eb01181dae14b15f7eaa0cbd6bd6f346df180fe2bf12b4bef18 SHA512 1ecaf13bf65b15f2201dc4dbbe9166de3f506c563d32db547140f34a56bf029c3242f0a333fd2957d36db721cba54e88b76d9dc686db884671fb5f3985269ad0
+EBUILD libglvnd-9999.ebuild 1384 BLAKE2B f327ec99b7e0c620dcccad15a40c2afdbe0b94fde4ea787426cbe01b0664d8d2549cbbee9d871eb01181dae14b15f7eaa0cbd6bd6f346df180fe2bf12b4bef18 SHA512 1ecaf13bf65b15f2201dc4dbbe9166de3f506c563d32db547140f34a56bf029c3242f0a333fd2957d36db721cba54e88b76d9dc686db884671fb5f3985269ad0
 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
deleted file mode 100644
index 51a26c8e0dc8..000000000000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index e520ae7ff4a8..000000000000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
deleted file mode 100644
index f3492462ddb7..000000000000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a322bd006c5e505a1a2406828211736a93c99924 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 15 Jan 2020 19:21:02 -0800
-Subject: [PATCH] tests: Add _GLOBAL_OFFSET_TABLE_ to PLATFORM_SYMBOLS
-
-On PA-RISC, the _GLOBAL_OFFSET_TABLE_ symbol is always exposed. See
-
-https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob;f=bfd/elf32-hppa.c;h=2e653083ce05a77b3e33c056e2f9a51b327c2b22#l1001
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=blob;f=sysdeps/hppa/dl-machine.h;h=9e98366ea3b09612d54a3e956d5c35c1bdc86560#l80
----
- bin/symbols-check.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bin/symbols-check.py b/bin/symbols-check.py
-index 1c028e4..1548638 100644
---- a/bin/symbols-check.py
-+++ b/bin/symbols-check.py
-@@ -30,6 +30,7 @@ import subprocess
- 
- # This list contains symbols that _might_ be exported for some platforms
- PLATFORM_SYMBOLS = [
-+    '_GLOBAL_OFFSET_TABLE_',
-     '__bss_end__',
-     '__bss_start__',
-     '__bss_start',
--- 
-2.24.1
-
diff --git a/media-libs/libglvnd/libglvnd-1.3.0.ebuild b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
index 75f6c80d4e7a..aa0f129196b9 100644
--- a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
@@ -41,12 +41,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-Fix-the-armv7-build.patch
-	"${FILESDIR}"/${P}-meson-Fix-the-PPC64-build.patch
-	"${FILESDIR}"/${P}-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
-)
-
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature X x11)
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 444880b86a29..aa0f129196b9 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~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