gentoo resync : 28.04.2021

5 files changed, 119 insertions, 107 deletions

diff --git a/games-arcade/gunocide2ex/Manifest b/games-arcade/gunocide2ex/Manifest
index fdedd1526379..82405816c24e 100644
--- a/games-arcade/gunocide2ex/Manifest
+++ b/games-arcade/gunocide2ex/Manifest
@@ -1,5 +1,5 @@
-AUX gunocide2ex-1.0-build.patch 5419 BLAKE2B 63ad2cb0bfb48a3d5dbca05135896663f2bc4326e9d8905f140e938054d31600ad2ac7fc6c8c765fd5c90d1faade9c27574d8a848d321269102bdbb9abd71854 SHA512 92c3c2c16b7c4e57e11d79827db349cfb3df20e09c89e7daf8fc178475ea64851f6d79fd259824fe8c98fbed4901c0189ead7f76d3f3c834080369d1231f9692
-AUX gunocide2ex-1.0-glibc2.10.patch 377 BLAKE2B 63fc32459bc8e9eae71e220ee109e0ad5337f6d2714c6e1abf8ed802abf177df109d8572f05064381de65c9f436e01738b3621cbfb61301df90754f6da155b3c SHA512 66c166995981d841ce9a0ee0d6e56d5cc09c3856ccf72abeb4e42457ab6773ca1fdb0000e8be15445152b628dc8719bcb38c0fff30a9602a3592f3f2b6484ada
+AUX gunocide2ex-1.0-build.patch 3630 BLAKE2B 52a1d29ce7571a8a8f62548e2fdc7d4d55861d13d66f3bea51dd63f067433791ec7512a169d2a6112eed5fee6a6655be5384719085ead240353958de79ede646 SHA512 bd3ac13840b039f6766c68e77f331f61c94f170657f5959f0c8cd85fbe61468ef6a6cb513b70e3b1f2bfe809111e48ff13f5b7e79e066883b2066f6be9269fbc
+AUX gunocide2ex-1.0-glibc2.10.patch 381 BLAKE2B effecdcc17776e9f92db5054158e8becd895b17e283cc2f3926d1cf10f0465f65596e8a5391e4fa188d9cfaaf7ac06ba3feb31a18710f6709502306191260486 SHA512 187520144d3702c0a9e29849601b82cbe4d5d06443c6bff26a9f6f9011438a712c01194327fe0ad43bed5cf376c061f96ed6b9b114fd54b58c64bf1804e5eda8
 DIST g2ex-setup.run 30844481 BLAKE2B 3d59d14e594c1f742d8f39098baeb68c4898f6d04aceefa1b6eeaf6c31378eda492b5984394c1b833e7b47b1360889e74f4e944fbf9721ac8f3456116bd469ca SHA512 e3c861843d88c3b09fa2e579d1be4b0590c04b7b401c7d592cf6b7150fc395445056ba599c0bc6f72ba7044cfc097070751d32bb66aa790e72e2b1c45407f2b2
-EBUILD gunocide2ex-1.0.ebuild 1611 BLAKE2B cbc60159b314662c10121898f0c38c594f3439c598e8334836b93daff4c895edf2127fc47245420345f4ed908ab1bd7aa4617c98d053426770a3954b1bb0965b SHA512 0ac72868bb81f8cc5043438967fbd7ddd7496723b0e00213ecc25a0f43611f4c5303c9d8c5657b0df2d46633e60226bf845e514864fa137f9aff0c364f018939
+EBUILD gunocide2ex-1.0-r2.ebuild 1755 BLAKE2B 4e79dadaf8ac3529255e46fe40ede39d18b159ba47067978f2a42914711fba1cefa6a602b53218bc775bd4ea175862aaa1d07a51d039e86354bca6616dd60d25 SHA512 474509fc044634c28e5cf243489a116dd077de67042fe7eb0b08cb8508ee5e53aee06704354bb3d1f118c7893c6e52945f5e7dbdcdae27b97e58bb9609435b56
 MISC metadata.xml 327 BLAKE2B 78befc8fb90a335e458fc40d096a8dd59c04da0c72b039f7ad816d37693558514d77a40f9bbec5966aa611d2f323a1e12ac44b2dcefda015260e669f3e622887 SHA512 0ad645742ce134798ac8178d859ccdeedc9b060f7d5065b825ac9c9158130e7221c068264ce82e95f066294c045a9440a9aca241484115057ad3a709afad905f
diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
index 9abce6c01a2b..a0ba41f50480 100644
--- a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
+++ b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
@@ -1,6 +1,5 @@
-diff -ur work.orig/src/cEffects.cpp work/src/cEffects.cpp
---- work.orig/src/cEffects.cpp	2002-01-12 16:19:00.000000000 -0500
-+++ work/src/cEffects.cpp	2009-06-10 18:14:27.000000000 -0400
+--- a/src/cEffects.cpp
++++ b/src/cEffects.cpp
 @@ -180,7 +180,6 @@
  	{

  		if(!i->update())

@@ -18,9 +17,8 @@ diff -ur work.orig/src/cEffects.cpp work/src/cEffects.cpp
  		}

  	}

  

-diff -ur work.orig/src/cFont.cpp work/src/cFont.cpp
---- work.orig/src/cFont.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cFont.cpp	2009-06-10 18:19:15.000000000 -0400
+--- a/src/cFont.cpp
++++ b/src/cFont.cpp
 @@ -62,7 +62,7 @@
  }

  

@@ -30,9 +28,8 @@ diff -ur work.orig/src/cFont.cpp work/src/cFont.cpp
  {

  	font = TTF_OpenFont(path,size);

  	if(font==NULL)

-diff -ur work.orig/src/cFont.h work/src/cFont.h
---- work.orig/src/cFont.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cFont.h	2009-06-10 18:19:27.000000000 -0400
+--- a/src/cFont.h
++++ b/src/cFont.h
 @@ -34,7 +34,7 @@
  	static void		delInstance();
  	static bool		initttf();
@@ -42,9 +39,8 @@ diff -ur work.orig/src/cFont.h work/src/cFont.h
  	void			setcolor(int r,int g,int b);
  	void			setshader(int r,int g,int b);
  	void			print(SDL_Surface *screen,int posx,int posy,const char *fmt, ...);
-diff -ur work.orig/src/cParticleSys.cpp work/src/cParticleSys.cpp
---- work.orig/src/cParticleSys.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cParticleSys.cpp	2009-06-10 18:14:27.000000000 -0400
+--- a/src/cParticleSys.cpp
++++ b/src/cParticleSys.cpp
 @@ -81,9 +81,6 @@
  		if(time-p->getstarttime()>p->getlifetime())
  		{
@@ -55,9 +51,8 @@ diff -ur work.orig/src/cParticleSys.cpp work/src/cParticleSys.cpp
  		}
  	}
  
-diff -ur work.orig/src/cSound.cpp work/src/cSound.cpp
---- work.orig/src/cSound.cpp	2002-01-12 16:27:34.000000000 -0500
-+++ work/src/cSound.cpp	2009-06-10 18:17:44.000000000 -0400
+--- a/src/cSound.cpp
++++ b/src/cSound.cpp
 @@ -92,7 +92,7 @@
  }

  

@@ -67,9 +62,8 @@ diff -ur work.orig/src/cSound.cpp work/src/cSound.cpp
  {

  	if(!sound_on)

  		return true;

-diff -ur work.orig/src/cSound.h work/src/cSound.h
---- work.orig/src/cSound.h	2002-01-08 12:30:57.000000000 -0500
-+++ work/src/cSound.h	2009-06-10 18:17:50.000000000 -0400
+--- a/src/cSound.h
++++ b/src/cSound.h
 @@ -35,7 +35,7 @@
  
  	bool			init();
@@ -79,9 +73,8 @@ diff -ur work.orig/src/cSound.h work/src/cSound.h
  	void				stopogg();
  	bool			loadwav(int index,char *path);
  	void				playwav(int index);
-diff -ur work.orig/src/cSprite.cpp work/src/cSprite.cpp
---- work.orig/src/cSprite.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSprite.cpp	2009-06-10 18:18:34.000000000 -0400
+--- a/src/cSprite.cpp
++++ b/src/cSprite.cpp
 @@ -29,7 +29,7 @@
  
  ///lädt ein BMP in das image-Surface
@@ -98,9 +91,8 @@ diff -ur work.orig/src/cSprite.cpp work/src/cSprite.cpp
 -}
 \ No newline at end of file
 +}
-diff -ur work.orig/src/cSprite.h work/src/cSprite.h
---- work.orig/src/cSprite.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSprite.h	2009-06-10 18:18:44.000000000 -0400
+--- a/src/cSprite.h
++++ b/src/cSprite.h
 @@ -26,7 +26,7 @@
  	cSprite();
  	~cSprite();
@@ -110,9 +102,8 @@ diff -ur work.orig/src/cSprite.h work/src/cSprite.h
  	void 	render(SDL_Surface *screen,int x,int y);
  	void 	setColorKey(int r,int g,int b);
  
-diff -ur work.orig/src/cSpriteAnim.cpp work/src/cSpriteAnim.cpp
---- work.orig/src/cSpriteAnim.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSpriteAnim.cpp	2009-06-10 18:20:09.000000000 -0400
+--- a/src/cSpriteAnim.cpp
++++ b/src/cSpriteAnim.cpp
 @@ -145,7 +145,7 @@
  }

  

@@ -129,9 +120,8 @@ diff -ur work.orig/src/cSpriteAnim.cpp work/src/cSpriteAnim.cpp
 -}
 \ No newline at end of file
 +}

-diff -ur work.orig/src/cSpriteAnim.h work/src/cSpriteAnim.h
---- work.orig/src/cSpriteAnim.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSpriteAnim.h	2009-06-10 18:20:16.000000000 -0400
+--- a/src/cSpriteAnim.h
++++ b/src/cSpriteAnim.h
 @@ -53,7 +53,7 @@
  	cSpriteAnim();
  	~cSpriteAnim();
@@ -141,9 +131,8 @@ diff -ur work.orig/src/cSpriteAnim.h work/src/cSpriteAnim.h
  	void	setColorKey(int r,int g,int b);
  	void	render(SDL_Surface *screen,cAnim *anim,int x,int y);
  	int		getMaxNum();
-diff -ur work.orig/src/cUtil.cpp work/src/cUtil.cpp
---- work.orig/src/cUtil.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cUtil.cpp	2009-06-10 18:16:29.000000000 -0400
+--- a/src/cUtil.cpp
++++ b/src/cUtil.cpp
 @@ -85,7 +85,7 @@
  }

  

@@ -153,9 +142,8 @@ diff -ur work.orig/src/cUtil.cpp work/src/cUtil.cpp
  {

  	FILE	*file;

  	char	buffer[512];

-diff -ur work.orig/src/cUtil.h work/src/cUtil.h
---- work.orig/src/cUtil.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cUtil.h	2009-06-10 18:16:39.000000000 -0400
+--- a/src/cUtil.h
++++ b/src/cUtil.h
 @@ -31,7 +31,7 @@
  

  	void	updatetime();

@@ -165,9 +153,8 @@ diff -ur work.orig/src/cUtil.h work/src/cUtil.h
  	void	drawpixel(SDL_Surface *screen, int x, int y,Uint8 R, Uint8 G,Uint8 B);

  	bool	collision(SDL_Rect objekt1,SDL_Rect objekt2);	

  

-diff -ur work.orig/src/mmgr.cpp work/src/mmgr.cpp
---- work.orig/src/mmgr.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/mmgr.cpp	2009-06-10 18:14:23.000000000 -0400
+--- a/src/mmgr.cpp
++++ b/src/mmgr.cpp
 @@ -59,6 +59,7 @@
  #include <time.h>

  #include <stdarg.h>

diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
index 6b659c76a82d..2bfdd80f0f84 100644
--- a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
+++ b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
@@ -1,5 +1,5 @@
---- src/mmgr.cpp
-+++ src/mmgr.cpp
+--- a/src/mmgr.cpp
++++ b/src/mmgr.cpp
 @@ -228,9 +228,9 @@
  

  static	const char	*sourceFileStripper(const char *sourceFile)

diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
new file mode 100644
index 000000000000..920de2e8b41e
--- /dev/null
+++ b/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop edos2unix toolchain-funcs unpacker
+
+DESCRIPTION="Fast-paced 2D shoot'em'up"
+HOMEPAGE="http://g2ex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer[vorbis]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-glibc2.10.patch
+)
+
+src_unpack() {
+	unpack_makeself
+	mkdir binary || die
+}
+
+src_prepare() {
+	default
+
+	edos2unix config.cfg
+
+	sed -i \
+		-e "s:/usr/local/games/gunocide2ex/config\.cfg:/etc/${PN}.cfg:" \
+		-e "s:/usr/local/games/gunocide2ex/hscore\.dat:/var/games/gunocide2ex/${PN}-hscore.dat:" \
+		-e "s:memleaks.log:/dev/null:" \
+		src/*.{h,cpp} || die
+
+	sed -i \
+		-e "s:/usr/local/games:/usr/share:" \
+		src/*.{h,cpp} $(find gfx -name '*.txt') || die
+}
+
+src_compile() {
+	cd src || die
+
+	tc-export CXX
+
+	emake \
+		CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" \
+		$(echo *.cpp | sed 's/\.cpp/.o/g')
+
+	$(tc-getCXX) ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die
+}
+
+src_install() {
+	dobin src/${PN}
+	dosym ${PN} /usr/bin/g2ex
+
+	insinto /usr/share/${PN}
+	doins -r gfx sfx lvl credits arial.ttf
+
+	insinto /etc
+	newins config.cfg ${PN}.cfg
+
+	insinto /var/games/${PN}
+	newins hscore.dat ${PN}-hscore.dat
+
+	fperms 660 /var/games/${PN}/${PN}-hscore.dat
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/g2ex
+
+	dodoc history doc/MANUAL_DE
+	docinto html
+	dodoc doc/manual_de.html
+
+	newicon g2icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Gunocide II EX"
+}
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
deleted file mode 100644
index c713085ac353..000000000000
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker toolchain-funcs games
-
-DESCRIPTION="fast-paced 2D shoot'em'up"
-HOMEPAGE="http://g2ex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_makeself
-	mkdir binary || die
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
-	edos2unix config.cfg
-	sed -i \
-		-e "s:/usr/local/games/gunocide2ex/config\.cfg:${GAMES_SYSCONFDIR}/${PN}.cfg:" \
-		-e "s:/usr/local/games/gunocide2ex/hscore\.dat:${GAMES_STATEDIR}/${PN}-hscore.dat:" \
-		-e "s:memleaks.log:/dev/null:" \
-		src/*.{h,cpp} || die
-	sed -i \
-		-e "s:/usr/local/games:${GAMES_DATADIR}:" \
-		src/*.{h,cpp} $(find gfx -name '*.txt') || die
-}
-
-src_compile() {
-	cd src
-	emake CXXFLAGS="$CXXFLAGS $(sdl-config --cflags)" $(echo *.cpp | sed 's/\.cpp/.o/g')
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die
-}
-
-src_install() {
-	dogamesbin src/${PN}
-	dosym ${PN} "${GAMES_BINDIR}/g2ex"
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r gfx sfx lvl credits arial.ttf
-	insinto "${GAMES_SYSCONFDIR}"
-	newins config.cfg ${PN}.cfg
-	insinto "${GAMES_STATEDIR}"
-	newins hscore.dat ${PN}-hscore.dat
-	dodoc history doc/MANUAL_DE
-	dohtml doc/manual_de.html
-	newicon g2icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Gunocide II EX"
-	prepgamesdirs
-}