From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 games-util/glbsp/Manifest                       |  4 ++--
 games-util/glbsp/files/glbsp-2.24-ldflags.patch |  8 ++++----
 games-util/glbsp/glbsp-2.24.ebuild              | 19 ++++++++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'games-util/glbsp')

diff --git a/games-util/glbsp/Manifest b/games-util/glbsp/Manifest
index 35756228aea6..62bdd8b5857c 100644
--- a/games-util/glbsp/Manifest
+++ b/games-util/glbsp/Manifest
@@ -1,4 +1,4 @@
-AUX glbsp-2.24-ldflags.patch 737 BLAKE2B 8450c3fc7d83aa5444802de8e415f1776c82422ced5a4c2320f39ee7989ce601a6fc0b97cc1a94e548d7b8a6bd40d5e53644c0725a694ddea2c0e782515a8b6c SHA512 78425825ea6049299afae48c2de89e9fa3e8f4994f176b7a42785eb3fcff625c69a2b3230f5aa624987fa4290f83eb9cf298d397b74171a2b0d94b70ab446d4f
+AUX glbsp-2.24-ldflags.patch 593 BLAKE2B 56cc840205923798cad39b6930d3d0d8b5b8b9c988064c6d8181c13a257970332ce8dda676d7062cbed9da7380430508d2987a9a26c52c85775c26435d99ad87 SHA512 6a3b0889a0c0cdf3adb8b24f69713b89d88559f4bdb2913fc5b0e697f2c78cd8804b719b4de71792da7d0aae8e6fd109b28eb5dc1d0b21a4d0b9396a8abf855c
 DIST glbsp_src_224.tar.gz 230977 BLAKE2B a8fce559e2d37e0662dd773f94d781a63bbce66d7fca87b785b7ba095670844fe441093d721eba95eb679457d6217327e93002e54848ed919cf34e552e152030 SHA512 562201093b69ae1db113479f8dd71e474d2d4ea7798b5e156dc096660e0b725a16ba44e8d2bfd332eba89b66d07ac2a1ddd803e75802c8fb3739a420701b2e1a
-EBUILD glbsp-2.24.ebuild 1524 BLAKE2B d34b5efb35b791b9409014c4e92f5c6e7f7873759e38a5084bd8444ad7e391da50a0b4d9769b2e04fbb181273035a3a688fe13d19963f4ecec5e67a5522df637 SHA512 753f32d0be4271e40d992dade06d5a61cabace99334568ebcf4776248b03804fe98cdd9b6fb4235559c51e48b62e9ef64a3102964573c9c6ef3bcf40689506fc
+EBUILD glbsp-2.24.ebuild 1515 BLAKE2B 274b57a226df0aca8d002c37a5519e546e37914ab112a12d75111f0b4e88973b1512e507cb1e5b41274c9d1e660fde2c44a8b555b33c0c10ef2c7f06385c5db2 SHA512 fcd6a378003843b92091469ddb01571d6301cfe55f3541081cd51705d1d3b9b1f5ea40f3d8234f41d4de6ecda90ac8233fbd63244297996c4a237751ac4dacd0
 MISC metadata.xml 328 BLAKE2B 642bdaa12af0d72ec65674304abdf376413e4721907ff967369be6234f46fc053792bee05d921d14e86d7432f8f355c8329ace8dab8464bdd8332c0e93c4f624 SHA512 ec7fab9de36fc312330b2e8251da6909a7d6ec1350145a7ef9681085993173f8ff8da796d4c868605c4391c7ad8ea4a11fb40e00b4fde754711dd060e0486347
diff --git a/games-util/glbsp/files/glbsp-2.24-ldflags.patch b/games-util/glbsp/files/glbsp-2.24-ldflags.patch
index e6adb0ff035c..56c9a4abcd8a 100644
--- a/games-util/glbsp/files/glbsp-2.24-ldflags.patch
+++ b/games-util/glbsp/files/glbsp-2.24-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.unx.old	2010-11-25 11:24:48.000000000 +0100
-+++ Makefile.unx	2010-11-25 11:25:10.000000000 +0100
+--- a/Makefile.unx
++++ b/Makefile.unx
 @@ -79,8 +79,7 @@
  	$(CC) $(CMD_FLAGS) -c $^ -o $@
  
@@ -10,8 +10,8 @@
  
  install: $(CMD_NAME)
  	cp $(CMD_NAME) $(INSTALL_PREFIX)/bin/
---- Makefile.unx.old	2010-11-25 11:31:27.000000000 +0100
-+++ Makefile.unx	2010-11-25 11:31:31.000000000 +0100
+--- a/Makefile.unx
++++ b/Makefile.unx
 @@ -125,7 +125,6 @@
  
  $(GUI_NAME): $(LIB_NAME) $(GUI_OBJS)
diff --git a/games-util/glbsp/glbsp-2.24.ebuild b/games-util/glbsp/glbsp-2.24.ebuild
index e6c982167ae0..79ed87ae1288 100644
--- a/games-util/glbsp/glbsp-2.24.ebuild
+++ b/games-util/glbsp/glbsp-2.24.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs versionator
+EAPI=7
 
-MY_PV=$(delete_version_separator 1)
+inherit desktop toolchain-funcs
+
+MY_PV=$(ver_rs 1 '')
 DESCRIPTION="A node builder specially designed for OpenGL ports of the DOOM game engine"
 HOMEPAGE="http://glbsp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/glbsp/${PN}_src_${MY_PV}.tar.gz"
+S="${WORKDIR}"/${P}-source
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,12 +17,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE="fltk"
 
 DEPEND="fltk? ( x11-libs/fltk:1 )"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${P}-source
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
+	default
+
 	sed -i \
 		-e "/^CC=/s:=.*:=$(tc-getCC):" \
 		-e "/^CXX=/s:=.*:=$(tc-getCXX):" \
-- 
cgit v1.2.3