gentoo auto-resync : 28:08:2023 - 22:03:35

5 files changed, 119 insertions, 9 deletions

diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index bd3675c91b6b..dbd2986394b6 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -2,7 +2,8 @@ AUX glew-2.0.0-install-headers.patch 457 BLAKE2B 284563a64b8f7c01fb13f0dda57acd3
 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.2.0.tgz 835861 BLAKE2B f403f3ebd5a78d21cf5744e8e6714a0558c7cda57930751afeced966a54bc9634c070eee4d791f5948bfc60b5c03ca5f488559c6372c0953c0ffe1711a3913f3 SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
-EBUILD glew-1.10.0-r100.ebuild 1743 BLAKE2B 50ed04bf437b8a1e4b36dfc071d2048cb7b739f01b7a9819d9659b3691040a9f7e5746927991d9d7fdaa2211bc7e144aade948eccc7849a240933963a8c3375e SHA512 18ecc02fad63241447305da0302cdff564c7cb950f7fec3b00b7b83739f37792fece77c1e7d91bd4d67b642ae3bdf87aae38a0573e461f020f4f4def8835e983
-EBUILD glew-1.6.0-r100.ebuild 1716 BLAKE2B 808250cdb6f4abc8efa376975941dd4bfdac94351c6769952b0dee88c918c3b96277770bb279b4dd456b2b0391b2f45dea1dac77d1d22d54e74679cab7abb77a SHA512 6f9822d8490ab07313648b41db0fbdfd4817e7cb988fc6fb45cecf5752cc1e7d2cc37b280b015b48928f222f1ea572a3605eae46748fde3ef732decbd93bf717
+EBUILD glew-1.10.0-r101.ebuild 1711 BLAKE2B fd24e1fe3ec3ee32de58cb0ee92ea3707c23f8f2fae914cabb0cb6e4ef755df24c74fdf83cde57ba2a159923d2c887dc77b1ea2519121cb1b334f573140baaf0 SHA512 01f7cd275bc13977bf80dbb29750ee618e0dc6049c35d9df1ab745b781082a17e1e9f17221d7ab55aca7dd23859a9cf1fca90cdbc46aa2b23ed97b535a2a26b8
+EBUILD glew-1.6.0-r101.ebuild 1684 BLAKE2B b2ad59a2a9bd2b88d78dfaab99bd36707fd0aa7b36675ee0f89b332c218e0f753736ac7d386216d88a60a92fedc7b7fdab5125c9d2f85feecf58e9f0536e8f76 SHA512 8764f23a95b24f8e96e74be850a653e95080691470b21439b57797a726897cf9bf305aa812fb5799c994c9608221891d408c6aea1a53f893b1031f2337f803e4
+EBUILD glew-2.2.0-r1.ebuild 2391 BLAKE2B 60cbb2cfca15c773e19b8ceac07c864e3892a01f382afa822bc5bed57c0b5e6e97ccb800a59e0d4f5500cd0dee071214b66f491ba16bc0fe65fad65dacc482d7 SHA512 0cc455460a903af6ccde21957d1e9b7e9815e988dafd7fbf7d1570c112c69772a5d5d0fca3b97b130dd7fa309f044f21c03c794a3d8aeecece2c99988b8183c4
 EBUILD glew-2.2.0.ebuild 2295 BLAKE2B 1b0aadc6227d7989db60ded11a085a98ce2e1ba964f0a02bcc3c1b0ad55c3cf7859cfee76b42a0f36065004695b612a3436b4eb35281f5d57c2865af2e85aeb1 SHA512 f34d00fd552b57157455d4b676eb31bc359fe78d3332f65c5a1d3bdd3dfab736bee093ad659dc6048193ebd7c87beb638776bda09351179c2a5a5feeeebe4dad
-MISC metadata.xml 368 BLAKE2B ef6790325ac73cc70cb8e0427f7a531b96008421f669b78135501e9eca2efc816ccff7a49b898f5e9607a10498187a9b1e4e7d4a88c23544e7c074c78f8aa7df SHA512 30fc250c3e28d4b441bac1358b2c391f5c445cc962a8b3ee5c627dba687ff74783f1297654196ca2b824140e5bc153067490db41ad358ffa009975258bc492f1
+MISC metadata.xml 457 BLAKE2B 3db0588843f80f31b547b75862682e60d46a396d00ac843368f568a9a19bce56df0c38ae89890ab73cb44827ecf0f75c139a63b520c3f611933bdd53a3f79e97 SHA512 a0454abf0ee07bcd3f4f4a2de576530fbba0b06baa4d144aecab962e4747e696deda45978cb8c2f42018abd56e340f7bc510b51eb09cded3b9409c868a23e9b3
diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r101.ebuild
index 449a8130f3d2..d577b1e7ea0c 100644
--- a/media-libs/glew/glew-1.10.0-r100.ebuild
+++ b/media-libs/glew/glew-1.10.0-r101.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit multilib-minimal toolchain-funcs versionator
+EAPI=8
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="The OpenGL Extension Wrangler Library"
 HOMEPAGE="https://glew.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r101.ebuild
index 8d79d12f3cc0..9bb6892b4030 100644
--- a/media-libs/glew/glew-1.6.0-r100.ebuild
+++ b/media-libs/glew/glew-1.6.0-r101.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit multilib-minimal toolchain-funcs versionator
+EAPI=8
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="The OpenGL Extension Wrangler Library"
 HOMEPAGE="https://glew.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/glew/glew-2.2.0-r1.ebuild b/media-libs/glew/glew-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..05123b7894e0
--- /dev/null
+++ b/media-libs/glew/glew-2.2.0-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="The OpenGL Extension Wrangler Library"
+HOMEPAGE="https://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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="doc egl-only static-libs"
+
+DEPEND="
+	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	!egl-only? (
+		>=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
+	)
+
+	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
+
+	default
+	multilib_copy_sources
+}
+
+glew_system() {
+	# Set the SYSTEM variable instead of probing. #523444 #595280
+	if use egl-only; then
+		echo "linux-egl"
+	else
+		case ${CHOST} in
+		*linux*)          echo "linux" ;;
+		*-darwin*)        echo "darwin" ;;
+		*-solaris*)       echo "solaris" ;;
+		mingw*|*-mingw*)  echo "mingw" ;;
+		*) die "Unknown system ${CHOST}" ;;
+		esac
+	fi
+}
+
+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 9dfc437a211d..f7add5ca6bd1 100644
--- a/media-libs/glew/metadata.xml
+++ b/media-libs/glew/metadata.xml
@@ -9,4 +9,7 @@
 		<remote-id type="github">nigels-com/glew</remote-id>
 		<remote-id type="sourceforge">glew</remote-id>
 	</upstream>
+	<use>
+		<flag name="egl-only">Enable EGL support and disable X11 support</flag>
+	</use>
 </pkgmetadata>