games-puzzle/blockout: update SRC_URI

Signed-off-by: Abdelrahman Sarhan <abdulrahmanayman1@gmail.com>

games-puzzle/blockout/Manifest

@@ -1,2 +1,3 @@
+DIST bl25-linux-x64.tar.gz 4380409 BLAKE2B 5f5511f4caa6e806d466c20cac3caadb7d80ce69754d3ba529d262e70294e0c3dfbc4baeeab4a95e501b61b440b9ce494c3423720f016c2d15c28dd6a4deee86 SHA512 f12b01c527b2167906e26f9c37591dd57ea905e2d05dd06e17c0a783a4749bda8264188d1dab2f5d008c0e860787bc6fecbc0d3a7b33204deb4bd6a6920813a1
 DIST bl25-linux-x86.tar.gz 4379299 BLAKE2B d4276b1a444a3cc656a44b4e28a2630413ac4c406e5a27e4f9c10f188b4b75957430325e3d551e8cedb93428737b7992af6c6e20a178fc5c4d3312aa6906eaa9 SHA512 2833bcda201b438de414f791f3ad5f8805ba0fc7f3aecb9911a813782954524a6ddaf27f8ba56dbcdca89a5ccacfaf59f43900544d3927f47d75abfc93c4a622
 DIST bl25-src.tar.gz 479743 BLAKE2B 4e42da05fdfda203e96fddb2f2d1f00878ecfd1f22cbe8bd1b0446a1960e51bb6db39bb031f25bd375c2b30a45b20c6abddbdc3b373f6fe1876097c4555f0bcf SHA512 8767c55fdbc511c07758a2e6905376b44e0e9478f3092f829147774538647c2fc8798b778a475e5efe7907ceb0d87136d27582c5ea0e372b12552ccf6aece445

games-puzzle/blockout/blockout-2.5.ebuild

@@ -8,7 +8,8 @@ DESCRIPTION="BlockOut II is an adaptation of the original Blockout DOS game"
 HOMEPAGE="https://www.blockout.net/blockout2/"
 SRC_URI="
 	https://downloads.sourceforge.net/blockout/bl25-src.tar.gz
-	https://downloads.sourceforge.net/blockout/bl25-linux-x86.tar.gz"
+	https://downloads.sourceforge.net/blockout/bl25-linux-x86.tar.gz
+	https://downloads.sourceforge.net/blockout/bl25-linux-x64.tar.gz"
 
 S="${WORKDIR}"/BL_SRC
 
@@ -25,8 +26,15 @@ RDEPEND="
 	virtual/opengl"
 DEPEND="${RDEPEND}"
 
-PATCHES="${FILESDIR}"/${P}-datadir.patch
+PATCHES=(
+	"${FILESDIR}/blockout-2.5-blockout-makefile.patch"
+	"${FILESDIR}/blockout-2.5-image-makefile.patch"
+	"${FILESDIR}/blockout-2.5-datadir.patch"
+)
 
+src_prepare() {
+	default
+}
 src_compile() {
 	GAME_DATADIR="/usr/share/${PN}"
 	emake -C ImageLib/src

games-puzzle/blockout/files/blockout-2.5-blockout-makefile.patch

@@ -0,0 +1,32 @@
+--- a/BlockOut/Makefile
++++ b/BlockOut/Makefile
+@@ -48,23 +48,25 @@
+ endif
+ 
+ CXX		= g++
++UCXXFLAGS := $(shell emerge --info | grep -w CXXFLAGS=".*" | cut -d '"' -f2)
++ULFLAGS := $(shell emerge --info | grep -w LDFLAGS=".*" | cut -d '"' -f2)
+ 
+ ifdef _release
+ 
+-CXXFLAGS =     -O2 -Dlinux -c \
++CXXFLAGS :=     $(UCXXFLAGS) -Dlinux -c \
+                -I/usr/include/SDL -I../ImageLib/src -I.
+ 
+-LFLAGS   =      -Wl,--strip-all \
++LFLAGS   :=      $(ULFLAGS) \
+ 		$(ADD_LIBS) \
+ 		-lSDL_mixer -lSDL -lasound \
+ 		-lGL -lGLU -lpthread -lm -ldl
+ 
+ else
+ 
+-CXXFLAGS =     -g -D_DEBUG -Dlinux -c \
++CXXFLAGS :=     $(UCXXFLAGS) -g -D_DEBUG -Dlinux -c \
+                -I/usr/include/SDL -I../ImageLib/src -I.
+ 
+-LFLAGS   =      -L $(SDL_LIBS) \
++LFLAGS   :=     $(UCXXFLAGS) -L $(SDL_LIBS) \
+ 		$(ADD_LIBS) \
+ 		-lSDL_mixer -lSDL -lasound \
+ 		-lGL -lGLU -lpthread -lm -ldl

games-puzzle/blockout/files/blockout-2.5-image-makefile.patch

@@ -0,0 +1,19 @@
+--- a/ImageLib/src/Makefile
++++ b/ImageLib/src/Makefile
+@@ -32,11 +32,14 @@
+ 
+ #---------------------------------------------------------------------
+ 
++UCXXFLAGS := $(shell emerge --info | grep -w CXXFLAGS=".*" | cut -d '"' -f2)
++UCFLAGS := $(shell emerge --info | grep -w CFLAGS=".*" | cut -d '"' -f2)
++
+ CXX	= g++
+ CC	= gcc
+ 
+-CXXFLAGS    = -O2 -Dlinux -c -I.
+-CFLAGS      = -O2 -Dlinux -c -I.
++CXXFLAGS    := $(UCXXFLAGS) -Dlinux -c -I.
++CFLAGS      := $(UCFLAGS) -Dlinux -c -I.
+ 
+ 
+ #--------------------------------------------------------------------

games-puzzle/blockout/metadata.xml

@@ -16,6 +16,10 @@
 			<name>Jean-Luc Pons</name>
 			<email>jlp_38@yahoo.com</email>
 		</maintainer>
+		<maintainer status="active">
+			<name>Abdelrahman Sarhan</name>
+			<email>abdulrahmanayman1@gmail.com</email>
+		</maintainer>
 		<remote-id type="sourceforge">blockout</remote-id>
 	</upstream>
 </pkgmetadata>