gentoo resync : 25.11.2020

5 files changed, 176 insertions, 15 deletions

diff --git a/games-arcade/sdlroids/Manifest b/games-arcade/sdlroids/Manifest
index 44e88c114857..1c901f1eb247 100644
--- a/games-arcade/sdlroids/Manifest
+++ b/games-arcade/sdlroids/Manifest
@@ -1,4 +1,6 @@
-AUX 1.3.4-sound.patch 658 BLAKE2B c7a9a46881e1f8f9d9c48e843338bc9c61a1a3cda4d8f3ca27f9e47410f0e40eca039bbf3069c8be2bdb23f97e9b02a1dc3e955e07b5191c54dceafc12f29782 SHA512 4d01491aa3a57c9ea43cb15e815e761e78cae50c8f4c7abce4b02c2343ad7671b688d81da94bbca8036d081b427a08791e0332e3fb3fdad71ba41b15f291a619
+AUX sdlroids-1.3.4-Makefile.patch 560 BLAKE2B 58c48f839eb49f783c651e3ad17b28be932fdc75ef7a19589c5b5e20103c0b4721ada73187c0017d2a579f73b0d0830e464fd71e5de7778132a5f888bf8db73f SHA512 6bd3c721fb8bb64931ea5be54aed91f3db2b393f5b95df2b3d22a847979807505d1bb4ec60d1d0785f1f680ca7f3caad612757ac2289e1e7a66953d28848f93f
+AUX sdlroids-1.3.4-fno-common.patch 3072 BLAKE2B 15db2f2e74066e244c10ddb59728c78d4880782a124bc9b6419e104a12f1520800b021d973d6b306abd3430c343357ef9edf1e0d1eba6a3c5eb93c2474125933 SHA512 cc72948fc0f2c6f685f86a54b496b02e669c6713981c3f760bfcc1138e8aa3079396ada38adf6ca6b8dadd551c9cc755b8ce6e8d38634c9610592866182e659e
+AUX sdlroids-1.3.4-sound.patch 658 BLAKE2B c7a9a46881e1f8f9d9c48e843338bc9c61a1a3cda4d8f3ca27f9e47410f0e40eca039bbf3069c8be2bdb23f97e9b02a1dc3e955e07b5191c54dceafc12f29782 SHA512 4d01491aa3a57c9ea43cb15e815e761e78cae50c8f4c7abce4b02c2343ad7671b688d81da94bbca8036d081b427a08791e0332e3fb3fdad71ba41b15f291a619
 DIST sdlroids-1.3.4.tar.bz2 136588 BLAKE2B e2dd15c0437184af557f96daaa11d9b50ae991e7c29ccd3e4a27f2668719d0f7ef8244e681bdac2d8726b1493175ab4a3f754daf0f471f606bcb5cbe1b5aa1c8 SHA512 abd202e462ac96781481defb9442f3ee69cbfafb5b4e82ae435dca23068257c3e65ba4886c0c41f2568a8568b52267ded24b8684efb3f7cafd21754103cc31b4
-EBUILD sdlroids-1.3.4-r4.ebuild 735 BLAKE2B 0458e0d6827e63d09a6989ef327a39a095c45f52402a088a361cd2b200dc48f8dd64bbf7035d7bd3e488c6e8eb50330f9c7e96a88954227d675136b95beb43d5 SHA512 6e673a7cdc0e5e96c033f2dcb5da96ac4fbff88ed595f70a965c11931b0748bbdf6b948c81c98106dac2bbeadf7416bc81e24fe6aa4d2ddcb65351d19a75c7b7
+EBUILD sdlroids-1.3.4-r4.ebuild 723 BLAKE2B eb26b871ea5583228670ecc0b79e51c3c1bf5d105fc47c6d2a38ccd52d2d8a34145a71b6398e4eb8a2db6809c32a97d9ecb2574e873a5fda9f4822708259172c SHA512 31f43275d101baf2509367dad71de22a5b04a0b8320d7e0aea0b1c9e8ca6148d8f3970a54ebe8605100f0f415b0857c4f35630bc966c59f6d1c87b5d8956df01
 MISC metadata.xml 331 BLAKE2B 6d663f6943fa4c3419e12335c8d6c4913ad7658635d37889373a3b90bb7fb810cc80478d41eee57e2cda6099b7b3b748bd7583b248be2543293e6d48d5ccbe42 SHA512 b126b6b4997b53170da871ca8cf66be75350ad1b2492a62f99b8a512eab5ce63a8ededd8794ca480ecf711a4e585e0b81d77b4f1fa0dcee500c54bd48878305b
diff --git a/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch
new file mode 100644
index 000000000000..9577d4cb6582
--- /dev/null
+++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,9 +23,9 @@
+ GFXDIR="$(datadir)/sdlroids/bmp/"
+ 
+ install-data-local:
+-	@/bin/sh $(srcdir)/mkinstalldirs $(SOUNDSDIR) $(GFXDIR)
+-	$(INSTALL_DATA) $(srcdir)/sounds/*.wav $(SOUNDSDIR)
+-	$(INSTALL_DATA)  $(srcdir)/bmp/*.bmp $(GFXDIR)
++	@/bin/sh $(srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDSDIR) $(DESTDIR)$(GFXDIR)
++	$(INSTALL_DATA) $(srcdir)/sounds/*.wav $(DESTDIR)$(SOUNDSDIR)
++	$(INSTALL_DATA) $(srcdir)/bmp/*.bmp $(DESTDIR)$(GFXDIR)
+ 
+ # Data directories
+ INCLUDES=-Wall 	-Wcast-align -DDATADIR=\"$(datadir)/sdlroids/\"
diff --git a/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch
new file mode 100644
index 000000000000..6288adf913b1
--- /dev/null
+++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch
@@ -0,0 +1,140 @@
+--- a/getargs.h
++++ b/getargs.h
+@@ -37,4 +37,4 @@
+ 
+ /* getargs() prototype */
+ void getargs(int, char *[]);
+-int flagargs[NUMARGS];
++extern int flagargs[NUMARGS];
+--- a/sdl.c
++++ b/sdl.c
+@@ -282,7 +282,7 @@
+ #define SGN(a)		(((a)<0) ? -1 : 1)
+ 
+ /* Draw an horizontal line in the current color */
+-inline void draw_horzline(Sint16 x1, Sint16 x2, Sint32 y)
++void draw_horzline(Sint16 x1, Sint16 x2, Sint32 y)
+ {
+   int i;
+   if (x1 < x2) {
+@@ -296,7 +296,7 @@
+ }
+ 
+ /* Draw an vertical line in the current color */
+-inline void draw_vertline(Sint16 x, Sint16 y1, Sint32 y2)
++void draw_vertline(Sint16 x, Sint16 y1, Sint32 y2)
+ {
+   int i;
+   if (y1 < y2) {
+@@ -310,7 +310,7 @@
+ }
+ 
+ /* Draw a line between two coordinates */
+-inline void drawline(int x1,int y1,int x2,int y2)
++void drawline(int x1,int y1,int x2,int y2)
+ {
+   int d, x, y, ax, ay, sx, sy, dx, dy;
+   if((dx = x2 - x1) == 0) { /* vertical line */
+@@ -358,7 +358,7 @@
+   }
+ }
+ 
+-inline void MoveTo(int x,int y)
++void MoveTo(int x,int y)
+ {
+   current_x = convx(x);
+   current_y = convy(y);
+@@ -366,12 +366,12 @@
+ 
+ 
+ /* Scaling blit function by Greg Velichansky */
+-inline Uint32 ifloor(Uint32 i)
++Uint32 ifloor(Uint32 i)
+ {
+   return i & 0xFFFF0000;
+ }
+ 
+-inline Uint32 iceil(Uint32 i)
++Uint32 iceil(Uint32 i)
+ {
+   return (i & 0xFFFF) ? i : ifloor(i) + (1<<16);
+ }
+@@ -379,7 +379,7 @@
+ 
+ /* The most pedantic-a%& getpixel and putpixel ever, hopefully. */
+ /* There may still be endianness bugs! These will be fixed after adequte testing. XXX XXX XXX */
+-inline int SDL_GetPixel (SDL_Surface *f, Uint32 x, Uint32 y,
++int SDL_GetPixel (SDL_Surface *f, Uint32 x, Uint32 y,
+ 			 Uint8 *r, Uint8 *g, Uint8 *b)
+ {
+   /*const Uint32 mask[] = {0x0, 0xff, 0xffff, 0xffffff, 0xffffffff};*/
+@@ -515,7 +515,7 @@
+     SDL_UnlockSurface(screen);
+   }
+ }
+-inline void lock_graphics() {
++void lock_graphics() {
+   if ( SDL_MUSTLOCK(screen) ) {
+     if ( SDL_LockSurface(screen) < 0 ) {
+       return;
+@@ -523,13 +523,13 @@
+   }
+ }
+ 
+-inline void ResetRefreshCoords()
++void ResetRefreshCoords()
+ {
+   minx = miny = -1;
+   maxx = maxy = 0;
+ }
+ 
+-inline void RedrawObject() {
++void RedrawObject() {
+   if(minx >= 0) {
+     rects[rec_counter].x = minx;
+     rects[rec_counter].y = miny;
+@@ -540,7 +540,7 @@
+ }
+ 
+ static int is_poly=0;
+-inline void LineTo(int x,int y)
++void LineTo(int x,int y)
+ {
+   x = convx(x); y = convy(y);
+   drawline(current_x,current_y,x,y);
+@@ -549,7 +549,7 @@
+ }
+ 
+ 
+-inline void Polyline(POINT *pts,int n)
++void Polyline(POINT *pts,int n)
+ {
+   int f;
+   if(n<2) return;
+@@ -560,7 +560,7 @@
+     LineTo(pts->x, pts->y);
+ }
+ 
+-inline void Circle(Sint16 x, Sint16 y, Sint32 r)
++void Circle(Sint16 x, Sint16 y, Sint32 r)
+ {
+   x = convx(x);
+   y = convy(y);  
+@@ -569,7 +569,7 @@
+ }
+ 
+ /* doesn't set current_[xy] because hyperoid.c doesn't need it to */
+-inline void SetPixel(Sint16 x, Sint16 y,Uint32 c)
++void SetPixel(Sint16 x, Sint16 y,Uint32 c)
+ {
+   current_color = c;
+   x = convx(x);
+@@ -578,7 +578,7 @@
+ }
+ 
+ 
+-inline void set_colour(int c)
++void set_colour(int c)
+ {
+   current_color = c;
+ }
diff --git a/games-arcade/sdlroids/files/1.3.4-sound.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-sound.patch
index eb2eb0c2ada4..eb2eb0c2ada4 100644
--- a/games-arcade/sdlroids/files/1.3.4-sound.patch
+++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-sound.patch
diff --git a/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild b/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild
index 5500d6870314..30d2f85a7f33 100644
--- a/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild
+++ b/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="Asteroids Clone for X using SDL"
 HOMEPAGE="http://david.hedbor.org/projects/sdlroids/"
@@ -11,24 +12,27 @@ SRC_URI="mirror://sourceforge/sdlroids/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	media-libs/libsdl
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sound.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
 	default
-	sed -i \
-		-e 's/$(SOUNDSDIR)/$(DESTDIR)$(SOUNDSDIR)/' \
-		-e 's/$(GFXDIR)/$(DESTDIR)$(GFXDIR)/' Makefile.in \
-		|| die "sed failed"
-	eapply "${FILESDIR}"/${PV}-sound.patch
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
 	default
+
 	newicon icons/sdlroids-48x48.xpm ${PN}.xpm
 	make_desktop_entry ${PN} SDLRoids ${PN}
 }