gentoo resync : 20.03.2021

4 files changed, 6 insertions, 131 deletions

diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 06a4dca1fab8..e1ee8cbf4552 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -1,11 +1,8 @@
 AUX glew-2.0.0-install-headers.patch 457 BLAKE2B 284563a64b8f7c01fb13f0dda57acd3d9ed410035cf1be7a8bf6dd9eb07dd84d0ce6a725b8a1999123e61a8de3cb676340eb1092db048e898b84ebe745906441 SHA512 a1a46eb47b4ccbde3dd11d97e4b0be6000a5dfba87e4c9d65d142e572beabd6b6efad2ee278062bc4dd57bb001b65300245fc301f36b11b429b760b4ad385346
-AUX glew-2.1.0-mesa-compat.patch 560 BLAKE2B 385adc6854a8b6cece3c1c5fa5452c7cdb5f99cfa13ce4818c500836803c1ed6dc6f4a6ab43f1add19ee76adf8daf076458a5cbd64012f2c1b6a9802bd98d791 SHA512 15117b0e22786311df0fd614ecba5230d5ec083d0d6acd457b7ae301f75a842c56e4ed50cc0187709fa11cdb2b59e3edeed2b5bc8cacc1b23caca4c1b837e520
 DIST glew-1.10.0.tgz 567605 BLAKE2B 18e2b3a4d60b69def1e68778554b43b85c69914daa20b8a64adb2e807df391a2eaff9c6cb2a3c46e5bbbf004655561ae4d2cd8a2fb883a2754f23564993a61b2 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca
 DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
-DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
 DIST glew-2.2.0.tgz 835861 BLAKE2B f403f3ebd5a78d21cf5744e8e6714a0558c7cda57930751afeced966a54bc9634c070eee4d791f5948bfc60b5c03ca5f488559c6372c0953c0ffe1711a3913f3 SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
 EBUILD glew-1.10.0-r100.ebuild 1908 BLAKE2B 59364c25acda1a16267dd8cd552161edce0666c0871a1d79bd70ed1229da1ea2115e1cb8e53609a3471b534ab0a09268335ed1024578787eb857b05028682e52 SHA512 88b6c7add297fbf7b8b954b761faa14020d614e96bcabc51e48d9dcc7da98c022062173c19188d996ad5fa294d989a9df14e62fe296259bf84093bacdffcab27
 EBUILD glew-1.6.0-r100.ebuild 1881 BLAKE2B d32880f9de5e91a332f2b42e3c3649e22234ac152e1216d944cab4be1866887673a2fa14de3e0136984b13dbb89ce75d125cef8a338507651185ea9f2b25a8e5 SHA512 a628e0b5eb4e6dc1691688ad59223793686e9d899046a1713195dcc69c7a467cc8acf23ad9ed5f5018088342b9c27bb51d08b58aec9c73c0dc87781c11417e42
-EBUILD glew-2.1.0-r1.ebuild 2485 BLAKE2B c2392a9ccf544e793c9e818c6933d222a0885b848beb38b1cc45b706e12455018a756cab16d4c06d71058c58aa06650e31339b2dfb4ab71a9cad2686de5aef4d SHA512 840c78fafa0f0c533290c9a9e9cfa68f3a8a1c3ff33c7f39118b229eb433a6638fa13dc47733d5076451e213bf63b7adafcf7202d1c62932e8cac0de7dfcb582
 EBUILD glew-2.2.0.ebuild 2446 BLAKE2B df522bb082823fd231b72a622bdd81a07c9722fd491b309ef29b1a8fb4017bf0c8559d72daa80b69075d0fe37915d27573d478c735d73acc0e822fbcd19cd823 SHA512 5bece96e3a75a5c95309ec324a26e5915c7b41c18d58c78ad97ae248eca97cec5d339fd178fb9431d4e0f0466491cb490cdda370935c2b0b99fc04f62609baad
-MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
+MISC metadata.xml 367 BLAKE2B 0ad00ad189fd494aa7c89bb30ab03d4bd13f05876bacb215c7cd5ab4b0dd61a35aef1ea0857b3143bf065438e9ce01ecf86ca61fb059fcea53ff9796c69d00c6 SHA512 b7df9f67584854dc8b6010bc804cc8940aa663c5640b2ba2c9c260ad5776b9ceac9c5afbcdb3eb5f37da75cf85b59eeee911d37661e318c3f5fecbfd6ef5b9a9
diff --git a/media-libs/glew/files/glew-2.1.0-mesa-compat.patch b/media-libs/glew/files/glew-2.1.0-mesa-compat.patch
deleted file mode 100644
index 391420e8138a..000000000000
--- a/media-libs/glew/files/glew-2.1.0-mesa-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/include/GL/glew.h b/include/GL/glew.h
-index b5b6987..a9f9e4b 100644
---- a/include/GL/glew.h
-+++ b/include/GL/glew.h
-@@ -93,7 +93,7 @@
- #if defined(__REGAL_H__)
- #error Regal.h included before glew.h
- #endif
--#if defined(__glext_h_) || defined(__GLEXT_H_)
-+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
- #error glext.h included before glew.h
- #endif
- #if defined(__gl_ATI_h_)
-@@ -109,6 +109,7 @@
- #define __X_GL_H
- #define __glext_h_
- #define __GLEXT_H_
-+#define __gl_glext_h_
- #define __gl_ATI_h_
- 
- #if defined(_WIN32)
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
deleted file mode 100644
index 8688c0b15c13..000000000000
--- a/media-libs/glew/glew-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="The OpenGL Extension Wrangler Library"
-HOMEPAGE="http://glew.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="
-	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-2.0.0-install-headers.patch
-		"${FILESDIR}"/${P}-mesa-compat.patch
-	)
-
-	sed -i \
-		-e '/INSTALL/s:-s::' \
-		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		-e '/^.PHONY: .*\.pc$/d' \
-		Makefile || die
-
-	if ! use static-libs ; then
-		sed -i \
-			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
-			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
-			-e '/INSTALL.*LIB.STATIC/d' \
-			Makefile || die
-	fi
-
-	# don't do stupid Solaris specific stuff that won't work in Prefix
-	cp config/Makefile.linux config/Makefile.solaris || die
-	# and let freebsd be built as on linux too
-	cp config/Makefile.linux config/Makefile.freebsd || die
-
-	default
-	multilib_copy_sources
-}
-
-glew_system() {
-	# Set the SYSTEM variable instead of probing. #523444 #595280
-	case ${CHOST} in
-	*linux*)          echo "linux" ;;
-	*-freebsd*)       echo "freebsd" ;;
-	*-darwin*)        echo "darwin" ;;
-	*-solaris*)       echo "solaris" ;;
-	mingw*|*-mingw*)  echo "mingw" ;;
-	*) die "Unknown system ${CHOST}" ;;
-	esac
-}
-
-set_opts() {
-	myglewopts=(
-		AR="$(tc-getAR)"
-		STRIP=true
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC) ${LDFLAGS}"
-		SYSTEM="$(glew_system)"
-		M_ARCH=""
-		LDFLAGS.EXTRA=""
-		POPT="${CFLAGS}"
-	)
-}
-
-multilib_src_compile() {
-	set_opts
-	emake \
-		GLEW_PREFIX="${EPREFIX}/usr" \
-		GLEW_DEST="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${myglewopts[@]}"
-}
-
-multilib_src_install() {
-	set_opts
-	emake \
-		GLEW_DEST="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-		"${myglewopts[@]}" \
-		install.all
-
-	dodoc README.md
-	if use doc; then
-		docinto html
-		dodoc -r doc
-	fi
-}
diff --git a/media-libs/glew/metadata.xml b/media-libs/glew/metadata.xml
index 055629524908..a123c0ed805d 100644
--- a/media-libs/glew/metadata.xml
+++ b/media-libs/glew/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Games</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nigels-com/glew</remote-id>
 		<remote-id type="sourceforge">glew</remote-id>