gentoo xmass resync : 25.12.2021

3 files changed, 69 insertions, 2 deletions

diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index c620e2c19da5..e5df18c97b52 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
 DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
+DIST libglvnd-1.4.0.tar.bz2 563441 BLAKE2B 079b37571da7f1eb3cf8f87ea727aeec04a27158f015889552787ff269cc779f33c10a426a7113d4e45b13008b6540c2a2eec2ac69cb1cb5c551ac82e11475e5 SHA512 a887044b6b3b8bb2dae74f28a9b92ffa0ab7b65adc74d788e28c292b99ed618f93deb1ddc041b9a9460cf46eba5f63a4ba1c20f120dea868659a022428689287
 EBUILD libglvnd-1.3.4.ebuild 1421 BLAKE2B b22257530cbf32ff9e61f9abeb5990a376e839caf28491d6ab5b99c149ce51a812cb9b6a7d8e43cf5f56bbf6dc21a969635270843556e407aa85b18a0977feca SHA512 35aec220b9ce9596cc668cefc40d6977282396f3c381bf6a633278186782cb336a9bccd4a335e4898c27b8c05bc5c175d033f1374259431fd900185e442ec321
-EBUILD libglvnd-9999.ebuild 1429 BLAKE2B fda7073e06cf25ec60594bca3adeed8b32d46479e0dc1bd6e39a86313a665ede380c204762ebd4e190ac68c5d32aeb223abf2755ee7aa1f53275d4a20e5d9e86 SHA512 bd63c9223b5f7051405b703d452153c917901d8b5db9f73229f5ee64a7e1daf4cacf114cda3c9741dd14284a3c51861a5e85cc5e8617d120dd4e398293f2ad7b
+EBUILD libglvnd-1.4.0.ebuild 1426 BLAKE2B 3ea571c65e40145ea193dcd978cee912e367b82ff84f27861e82ca1cb5ef073f2c6326975bea77ac344751173f1a48f8f2d8460041e0e4370de5929a728ca1c5 SHA512 c8af8a78d63eb8f65c96b5a4e031a5667eb5272ced4ab3837f17a3d5d9253bef2810cb499bd24f94c084a284fafceaeaa34ec17314a2b27831c7f4af1553a5e4
+EBUILD libglvnd-9999.ebuild 1426 BLAKE2B 3ea571c65e40145ea193dcd978cee912e367b82ff84f27861e82ca1cb5ef073f2c6326975bea77ac344751173f1a48f8f2d8460041e0e4370de5929a728ca1c5 SHA512 c8af8a78d63eb8f65c96b5a4e031a5667eb5272ced4ab3837f17a3d5d9253bef2810cb499bd24f94c084a284fafceaeaa34ec17314a2b27831c7f4af1553a5e4
 MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
diff --git a/media-libs/libglvnd/libglvnd-1.4.0.ebuild b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
new file mode 100644
index 000000000000..f6b7cee43834
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2018-2021 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_{7..10} )
+VIRTUALX_REQUIRED=manual
+
+inherit ${GIT_ECLASS} meson-multilib 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(+)]
+	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=false )
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use X; then
+		virtx meson_src_test
+	else
+		meson_src_test
+	fi
+}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index f3579afc1b9c..f6b7cee43834 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -51,7 +51,7 @@ multilib_src_configure() {
 		$(meson_feature X x11)
 		$(meson_feature X glx)
 	)
-	use elibc_musl && emesonargs+=( -Dtls=disabled )
+	use elibc_musl && emesonargs+=( -Dtls=false )
 
 	meson_src_configure
 }