From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 media-libs/libglvnd/Manifest                 |  4 +-
 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 +-
 4 files changed, 76 insertions(+), 76 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/Manifest b/media-libs/libglvnd/Manifest
index ee604a826a57..42c52581a34e 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,4 @@
 DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
-EBUILD libglvnd-1.3.2-r1.ebuild 1534 BLAKE2B 9a515f93cacd2d16dae222b0cebc4267ec893300b84a39130e75b12db36a029e488ff5e58f3379ea0ce22610073eb4690dc459f3d996d11704a64bd844297a80 SHA512 b0c4eef0ed3e236aed1c891fa912146ebcacad90215e5a150771bd1b685d00e0f6fb4e6e3b23f6717dc60f80fa59d851b207f72ecddaf1f12e66452e005da5ad
-EBUILD libglvnd-9999.ebuild 1541 BLAKE2B 1734a7c993bf0023b47c7da30eee02f51171642612ef5e4e970eaaa903bf510cafa5c6aff02641c0a0ef61a77aca56705c3b808a9e58eb1e527f5fc39337704b SHA512 847ce31c298f05b67478d2d3b852afd6872fb7fcada81e4baa92e8700fddb2084a617150f3b3aac92681b399a4d82ffad562dbd1b806be802f823c17ec4b085a
+EBUILD libglvnd-1.3.2-r2.ebuild 1527 BLAKE2B 6dc5864dcf4ed749e6d6f07f392beb955c6c65bdb2582dd67eeddc8ea4a2212889596018953ece75451862b05f0dbf3771c01aa2bdbe6b6931fdbd9c36724fbb SHA512 007f3b17e2cfab1d20aa56e9ccf3ad8875de1290c7f49e440895d2e2f41020e9d5d70c5ed2c78ced5dc9e1169b13bd9344ff2587997941d80ceda05fd8c3c976
+EBUILD libglvnd-9999.ebuild 1535 BLAKE2B 58ddbb76e270935587fd4baa48985b015c037c8f3cff87297cd6f784fc343494f05d376a72500aed41eb440618fd3939e31acea0002d1a94a251bfbd959996cf SHA512 933168d07eb2ce996b1c32d27ddf3bca35595f0b98fb9abc204fa31e0c378c5ddc493e26dae88eae13675143220fbf5eb2f2e524a67028c55f1ff5c2d6adc47e
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
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 4c9e3146130b..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,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-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