gentoo resync : 29.06.2020

4 files changed, 90 insertions, 2 deletions

diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 83947497e22e..f9acf8a643bc 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
 DIST libglvnd-1.3.1.tar.bz2 714436 BLAKE2B 31b91f678b0335a7db3e697129dabd157c37fee0ec0f81f7d0be68ffcf9d6be2989a929f7b1fb87b505168ab4a3cc07b4cecf103f1d5a2a3b866eedb5a3a494b SHA512 99bbe8447f7791c8a4b2ab4e9f3067309ea3ffb9a042b0b5e80d1eac7e6e36af8b5ec56ec3266f34343d705521827956f2fdca27be386f40e130cec300e8342c
-EBUILD libglvnd-1.3.1.ebuild 1427 BLAKE2B 4c677c592779d22a9a5bd0eec7f703d4f9e2f04faa63aaee48bd3812d114cf0bd6544fd9f3181bcad9f1ea3a43a9530e690e721f267811d623398ea58bd4bdf6 SHA512 13add67754576bdc1c410159f4766baf2fb4616792403bfa3fe20c085500f12a64eda0302a3101c0c1dd4f0e5d832e359a18096f2cfb9d77ec7c9276afd3daa1
-EBUILD libglvnd-9999.ebuild 1435 BLAKE2B 749fea4a3780e72e805d8fd8191c1e20768746ea3ed68d6ce60f35257aa8ff77bd6f28a8aabd55919b32e1682b741bb0e55ffa3ac652912e22b9c6cd2d6a31c8 SHA512 a17c76e0c89890a585f1eda6f993b8f0fc3c52a64efe85ab068bb7dfa64a0672226504f7412ee5ff5ed83c5b6bf4953aac3a48a60fe7189731fcb485fc6f7b79
+DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
+EBUILD libglvnd-1.3.1.ebuild 1554 BLAKE2B 9262984fc8a25aca9a69be941e33f682664f22c6f830e0f9ff8f8e1ede4d0be76faada6bf92a3e3a075681eb4784627e301c66f8bfe117eda703ebc8563ea66f SHA512 f631b6da703bf214d4d03e86a695c586a4dad9f64f93f1038918021097d043abed4bf60978f3e6e52ec4e40f4f6bca49752e41e745f1d601ecb9c0339dc222ef
+EBUILD libglvnd-1.3.2.ebuild 1562 BLAKE2B 0116ea12b00f40491b76f30ddb5e98b9c1b62d4e16df367136fc6673656ca0300f6d9bc7c997fc144fe0b6a7050e7880212d433151f05fec69a43d5e14d32d30 SHA512 1753a9eb0e6f7d62176b9a4af37794d30f31ea3c5a522d44142e42cd981c2ed0c08d89c8cf6a3cd692654f83c16ca90b25ac88b1ab37ec616a2b4a82d4c06349
+EBUILD libglvnd-9999.ebuild 1562 BLAKE2B 0116ea12b00f40491b76f30ddb5e98b9c1b62d4e16df367136fc6673656ca0300f6d9bc7c997fc144fe0b6a7050e7880212d433151f05fec69a43d5e14d32d30 SHA512 1753a9eb0e6f7d62176b9a4af37794d30f31ea3c5a522d44142e42cd981c2ed0c08d89c8cf6a3cd692654f83c16ca90b25ac88b1ab37ec616a2b4a82d4c06349
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.1.ebuild b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
index 6d4bfd94dd56..a11e7d7b630f 100644
--- a/media-libs/libglvnd/libglvnd-1.3.1.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
@@ -41,6 +41,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature X x11)
diff --git a/media-libs/libglvnd/libglvnd-1.3.2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2.ebuild
new file mode 100644
index 000000000000..4c976349c6d9
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.3.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2018-2020 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_{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 ~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
+
+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 )"
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+		$(meson_feature X glx)
+	)
+	use elibc_musl && emesonargs+=( -Dtls=disabled )
+
+	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 772d3cb97ea0..4c976349c6d9 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -41,6 +41,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature X x11)