From e16d502f0718d798b2ec700d893b22410b97cea2 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 15 Oct 2020 19:31:52 -0700
Subject: media-libs/libglvnd: Update media-libs/mesa blocker

Closes: https://bugs.gentoo.org/744715
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild | 73 ----------------------------
 media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild | 73 ++++++++++++++++++++++++++++
 media-libs/libglvnd/libglvnd-9999.ebuild     |  2 +-
 3 files changed, 74 insertions(+), 74 deletions(-)
 delete mode 100644 media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild
 create mode 100644 media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild

(limited to 'media-libs/libglvnd')

diff --git a/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild b/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild
deleted file mode 100644
index cc0900b1c3fb..000000000000
--- a/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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..9} )
-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-20.2[-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=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-1.3.2-r2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..2f410a3443a5
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
@@ -0,0 +1,73 @@
+# 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..9} )
+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(+)]
+	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 8a245b0aaae9..0eabebb4b67c 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -32,7 +32,7 @@ RESTRICT="!test? ( test )"
 BDEPEND="${PYTHON_DEPS}
 	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 RDEPEND="
-	!<media-libs/mesa-20.2[-libglvnd(-)]
+	!media-libs/mesa[-libglvnd(+)]
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
-- 
cgit v1.2.3-65-gdbad