gentoo resync : 28.04.2021

6 files changed, 91 insertions, 75 deletions

diff --git a/games-fps/red-blue-quake2/Manifest b/games-fps/red-blue-quake2/Manifest
index b5a457d5be80..9a65ccad644e 100644
--- a/games-fps/red-blue-quake2/Manifest
+++ b/games-fps/red-blue-quake2/Manifest
@@ -1,7 +1,7 @@
-AUX 0.1-gentoo.patch 1964 BLAKE2B 75d24546aa8792f0cc0888c5730882ec8939f0ea654a17dad0b3bb2b1921ee0c0928593c667daf87180e1d63634d5afa479c71e942c907a1787b3ecd47cdce41 SHA512 87b7d3a355a57940b1ce2be3e30ff5053aa83af2e53018f1ea00556dba67cbb1767729867eabf062faf1a08eb2ca601176dbccd6c9585160edb2e3477b22fa5a
-AUX red-blue-quake2-0.1-gcc41.patch 895 BLAKE2B eb246353c60602806a835a6ef375d45cb14b08bf51fdeab4eaea884ce1b94b03c7d017ee3c8295d1c2f8d80cf9c0c478423e7033dee515581c497459ee0501b6 SHA512 9cb57a27bc5e8e7123c40a55625f4e227d5c81e179de3119441d7447de7701c9f6e8fc76a24e1b6c21bb92eff142aed24ffed2da39cb5bf2f87eaf8600b210bc
-AUX red-blue-quake2-0.1-ldflags.patch 3382 BLAKE2B 04576aaef36280b2dc62ce22f50c6689ac5343c148760aef3ad68150a8560bdf5e31f671fa09bcdeb3716b547f0509b4e83c1a2b4a7f741ed2798b7c3a4e6327 SHA512 a49ab8462322740fcfef70c6bff16df9b164cfa0cace00bdf366e10db1d0fc13770d97f9aa8dcf1f92d1555d7d978ce7f947d58bc3d030fd2c1be0983e74470a
+AUX 0.1-gentoo.patch 1700 BLAKE2B 4db0ae52fa70b4fbb13c7aefefd5ecc818364432c74c8442bb667873026b18622b8e9b5bd83fb975d65d3909d8f90422e5c3f4ef51a0c2d282bc65a42d45ce99 SHA512 27771e9930a2c09c8259eea611e81fb633c3423e02c479e930865552e50e47900a25529c36da770fd39d15276efd1cfd2bda2dae3f6ea8fb90f29a246112500c
+AUX red-blue-quake2-0.1-gcc41.patch 739 BLAKE2B 9074256ac44e5b7afd3932989a878446cec714b4f90daa58e4f5ddf2d84d7c15394c2cd1fa4c71b6a0b46733644cbf44f37279fb0104f21a17a42eb9c0fbe441 SHA512 7a1879dc60074069d5aae87d56fb3b4b208db35c6ae0abcdf372ab7d4bf1ea01ad0af95b7e54ea3fc0c249aa1d9cb5dce56faf001184d5674c4ddd567b52f12a
+AUX red-blue-quake2-0.1-ldflags.patch 3322 BLAKE2B 6e9fd4e3ce65b9c798c257b28a53896bba8d1a05c0a4ce818fde52620b6aad9c3e8d66a6ea3274eb41c4f0a2ef84ccb032937715cb8c95bfc85a411a8c27a7f9 SHA512 36a63ccc58eac7b1b1b16562fd12a05372402149407c645712cd353f15cf9ec1b77ee64d05e44cd8efb4aa2dc70d97ff22cf95c954302ce2af969392a938ac57
 DIST q2source-3.21.zip 1477764 BLAKE2B afdeeff318e23397d24f9ecc68f4015b03d58d3f7794dd23febc4e285a916b2cf8c93b872a62a33dc1a4b7c2fff34ad92781e0320296cc13d4721b8cd5bf345a SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752
 DIST red-blue-quake2-0.1.tar.gz 34874 BLAKE2B 6dc10e8307c4274961ee133af0721d5cb9e1605de4fb47c3256b4a54b91c5e7ea79622140bf5eda2cbce10075ba971c40547726cf45f99e81cadc20828663384 SHA512 4123fb1cceb788068c5cd525e3e03cce8a993ecdd0d86c3c154426689a7893b6d33cddeafbb53761a27473a050829545e7fc802f1236f4dc60161103ad259da5
-EBUILD red-blue-quake2-0.1.ebuild 1314 BLAKE2B 612a708a4f576beb4e121c55781ad5b47768fa27a0d9514b030650ace4a10fc1168e18387c059e13d46af76b3186205dfbb8163938c86791eca95987f3defa37 SHA512 22c42fa7611234616e2cc4f5f4d648e0cc0772033071aa27b78dacb54d804b5af42c6703747b8844078880f3bf7b10c23daeaf6ac9fce43963c58b52fa162fa0
+EBUILD red-blue-quake2-0.1-r1.ebuild 1379 BLAKE2B 75e582d235cbf207238b955378f2eeba273492eed037d7d4d99a30cdf0875557504a307f3a22bc2f79e316b9656b2635f7975a7c7dfd0a358d1dc411f22cd803 SHA512 bc9cd60a41fceeff168d86f0c2b6476c4cbc5fbe621e3bd7aa582e30eb872a28cea65b426db9626ee3922a0279dc4063482fe6ad053f241f58de61ece992fd75
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/red-blue-quake2/files/0.1-gentoo.patch b/games-fps/red-blue-quake2/files/0.1-gentoo.patch
index fd13df9bcb45..e283e6e3bc03 100644
--- a/games-fps/red-blue-quake2/files/0.1-gentoo.patch
+++ b/games-fps/red-blue-quake2/files/0.1-gentoo.patch
@@ -1,6 +1,6 @@
 diff -ur Makefile.old Makefile
---- Makefile	2001-12-29 20:37:22.000000000 -0500
-+++ Makefile	2003-07-17 22:14:50.000000000 -0400
+--- a/linux/Makefile
++++ b/linux/Makefile
 @@ -54,7 +54,7 @@
  RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
  	-fomit-frame-pointer -fexpensive-optimizations
@@ -11,8 +11,8 @@ diff -ur Makefile.old Makefile
  endif
  
 diff -ur sys_linux.c.old sys_linux.c
---- sys_linux.c.old	2001-12-22 18:45:58.000000000 -0500
-+++ sys_linux.c	2003-07-17 22:34:11.000000000 -0400
+--- a/linux/sys_linux.c
++++ b/linux/sys_linux.c
 @@ -220,7 +220,7 @@
  	char	curpath[MAX_OSPATH];

  	char	*path;

@@ -38,8 +38,8 @@ diff -ur sys_linux.c.old sys_linux.c
  	}

  

 diff -ur ../qcommon/files.c ../qcommon/files.c
---- ../qcommon/files.c	2001-12-22 16:32:26.000000000 -0500
-+++ ../qcommon/files.c	2003-07-17 22:34:29.000000000 -0400
+--- a/qcommon/files.c
++++ b/qcommon/files.c
 @@ -865,7 +865,7 @@
  	//

  	// start up with baseq2 by default

@@ -50,8 +50,8 @@ diff -ur ../qcommon/files.c ../qcommon/files.c
  	// any set gamedirs will be freed up to here

  	fs_base_searchpaths = fs_searchpaths;

 diff -ur ../qcommon/qcommon.h ../qcommon/qcommon.h
---- ../qcommon/qcommon.h	2001-12-22 16:32:26.000000000 -0500
-+++ ../qcommon/qcommon.h	2003-07-17 21:20:03.000000000 -0400
+--- a/qcommon/qcommon.h
++++ b/qcommon/qcommon.h
 @@ -25,7 +25,7 @@
  

  #define	VERSION		3.21

diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
index 1f933d33537e..22ca5c56a54f 100644
--- a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
+++ b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
@@ -1,5 +1,5 @@
---- ../game/g_local.h.old	2006-05-07 00:27:45.000000000 +0200
-+++ ../game/g_local.h	2006-05-07 00:28:06.000000000 +0200
+--- a/game/g_local.h
++++ b/game/g_local.h
 @@ -458,11 +458,6 @@
  extern	int	sm_meat_index;

  extern	int	snd_fry;

@@ -12,8 +12,8 @@
  // means of death

  #define MOD_UNKNOWN			0

  #define MOD_BLASTER			1

---- ../ctf/g_local.h.old	2006-05-07 00:36:21.000000000 +0200
-+++ ../ctf/g_local.h	2006-05-07 00:36:38.000000000 +0200
+--- a/ctf/g_local.h
++++ b/ctf/g_local.h
 @@ -466,11 +466,6 @@
  extern	int	sm_meat_index;

  extern	int	snd_fry;

diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
index 58beb0f3cec5..547b9045a869 100644
--- a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
+++ b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-18 09:09:48.000000000 +0200
-+++ Makefile	2010-10-18 09:15:59.000000000 +0200
+--- a/linux/Makefile
++++ b/linux/Makefile
 @@ -59,7 +59,7 @@
  endif
  
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1-r1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1-r1.ebuild
new file mode 100644
index 000000000000..01e871966b25
--- /dev/null
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Red-blue Quake II! Play quake2 with 3D glasses!"
+HOMEPAGE="https://www.jfedor.org/red-blue-quake2/"
+SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
+	https://www.jfedor.org/red-blue-quake2/${P}.tar.gz"
+S="${WORKDIR}"/quake2-3.21
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo.patch
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	cd linux || die
+
+	sed -i \
+		-e "s:GENTOO_DIR:$(get_libdir)/${PN}:" \
+		sys_linux.c || die
+
+	sed -i \
+		-e "s:/etc/quake2.conf:/etc/${PN}.conf:" \
+		sys_linux.c vid_so.c || die
+
+	sed -i \
+		-e 's:-O6::' \
+		-e 's:-g::' \
+		Makefile || die
+
+	echo "$(get_libdir)"/${PN} > "${T}"/${PN}.conf || die
+}
+
+src_compile() {
+	cd linux || die
+
+	mkdir -p releasei386-glibc/ref_soft || die
+
+	emake \
+		CC="$(tc-getCC)" \
+		GENTOO_CFLAGS="${CFLAGS}" \
+		GENTOO_DATADIR=/usr/share/quake2/baseq2/ \
+		build_release
+}
+
+src_install() {
+	cd linux/release* || die
+
+	exeinto "$(get_libdir)"/${PN}
+	doexe gamei386.so ref_softx.so
+
+	exeinto "$(get_libdir)"/${PN}/ctf
+	doexe ctf/gamei386.so
+	newbin quake2 red-blue-quake2
+
+	insinto /etc
+	doins "${T}"/${PN}.conf
+}
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
deleted file mode 100644
index 96715daaab62..000000000000
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="red-blue Quake II !  play quake2 w/3d glasses !"
-HOMEPAGE="https://www.jfedor.org/red-blue-quake2/"
-SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
-	https://www.jfedor.org/red-blue-quake2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/quake2-3.21/linux
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-ldflags.patch
-	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" \
-		sys_linux.c || die
-	sed -i \
-		-e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
-		sys_linux.c vid_so.c || die
-	echo "$(games_get_libdir)"/${PN} > "${T}"/${PN}.conf || die
-}
-
-src_compile() {
-	mkdir -p releasei386-glibc/ref_soft
-	emake \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release
-}
-
-src_install() {
-	cd release*
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softx.so
-	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so
-	newgamesbin quake2 red-blue-quake2
-
-	insinto "${GAMES_SYSCONFDIR}"
-	doins "${T}"/${PN}.conf
-
-	prepgamesdirs
-}