gentoo resync : 05.12.2021

3 files changed, 2 insertions, 69 deletions

diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index eaed069a331e..db4d83033bd5 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,4 @@
-DIST libglvnd-1.3.3.tar.bz2 715179 BLAKE2B 781550cbda489dca31596115c78edd1d4f1fe66062218c83ccf6cb34707501fce839b649c2b0aee3621c283397acca8fb40ad16c0388551ce7caa7fd79b7dbf5 SHA512 7da9e12c010a8f109cd24ca4c2ffc846dd7d23f82157e1e39b8ae69575fabcc9592c0b639b23d2112fe2026b679f1536f1b705a5c948fefea105418803e1b629
 DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
-EBUILD libglvnd-1.3.3.ebuild 1420 BLAKE2B dba3d011a2574938b1e9ac2be10b39f57d0c115f4b151e9af2f7333e6d37f21a9da7b354832a3e7a7534d2a42c6e92ff8407d9c5b8554ea69785a446cc025461 SHA512 355ecf20261605a8f64661f3e00a733e0ebcc05ac399ee23f13836888843805664d120aaeef3703c9aad727afa8166c2f00cfaf3649fb5fef95bfafbd1514455
-EBUILD libglvnd-1.3.4.ebuild 1425 BLAKE2B 0596ef39fa64e63a6b405c577f6f943beb80adbc1a8f90dbfbe3e7662b8ece46129f265c336eb5f6c97af4230257ccc0a622e49e577172d790dd28071720729a SHA512 e8fdc748ac1fd0d5216d59e4931e6437f32f5b710924d30dacb07395527b986ab22396f341e4b8d87e84b0c5b2099a0ca008653fb6ffd411c7d2bfaf1af8ba80
+EBUILD libglvnd-1.3.4.ebuild 1420 BLAKE2B dba3d011a2574938b1e9ac2be10b39f57d0c115f4b151e9af2f7333e6d37f21a9da7b354832a3e7a7534d2a42c6e92ff8407d9c5b8554ea69785a446cc025461 SHA512 355ecf20261605a8f64661f3e00a733e0ebcc05ac399ee23f13836888843805664d120aaeef3703c9aad727afa8166c2f00cfaf3649fb5fef95bfafbd1514455
 EBUILD libglvnd-9999.ebuild 1428 BLAKE2B 35ad17719893213a5a0b18d75df985a5bb45415240c2dde7eca37e5f37c6b8787d9797b6aecbbdbf0c1fac4815524977425acf72d78e71f6fee68a48511064be SHA512 6931b29a79a836234703201b4e377940f110db26567d1da8e78a2b3402c2747cc0b106341e1bb48b8c00b6cc38b2c88b2cde298fd6daccfa97ef74cb889635a8
 MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
diff --git a/media-libs/libglvnd/libglvnd-1.3.3.ebuild b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
deleted file mode 100644
index 8c83eaea5785..000000000000
--- a/media-libs/libglvnd/libglvnd-1.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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..9} )
-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=disabled )
-
-	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-1.3.4.ebuild b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
index 51fb9eba7d7b..8c83eaea5785 100644
--- a/media-libs/libglvnd/libglvnd-1.3.4.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
@@ -19,7 +19,7 @@ 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"
+	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