gentoo resync : 29.06.2020

8 files changed, 88 insertions, 55 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index d90d9151a236..070ccd7bc6a1 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 99ea9b6bfc90..88bd0e04287a 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c
 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
 DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
 DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
-EBUILD dwarf-fortress-0.44.12.ebuild 2340 BLAKE2B 7a7f1e620345917ec3f3bd50718ac70c3542dcfa1efa68dc6af4e258bda1c89103265fdd5906507297a807504f03502260a8f5a49fd130c7d9ee6a139b415a11 SHA512 dea3a21f4b69854a6ef8eaf5fd7688c67595a8b4bebef745c85ae8a32786fd37200723113b644b87da1af16ecbba91b25af768519ba719ec24ee4181a2d24526
+EBUILD dwarf-fortress-0.44.12.ebuild 2343 BLAKE2B 0eb61350aad85953aacb00e1ee9503a765d1bd45e276229dcb6174549efc6070b9cf13884bf9dae51da2724a968bd5c4509231c81d1523457a0dc155e61312c9 SHA512 8fee92a9c804fb04ed8adccb4691ffc9185a6739ced24ff171f6b78a9da666fde980fcd5adda1184e3d0b8156d525968f503542a89fff38e4fe63f323564f4f9
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
index 1407c994deae..dfcfe78cf3cf 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,9 +10,9 @@ MY_PN=df
 MY_P=${MY_PN}_${MY_PV}
 
 DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="http://www.bay12games.com/dwarves"
-SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
-	x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
+HOMEPAGE="https://www.bay12games.com/dwarves"
+SRC_URI="amd64? ( https://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
+	x86? ( https://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
 
 LICENSE="free-noncomm BSD BitstreamVera"
 SLOT="0"
diff --git a/games-roguelike/wrogue/Manifest b/games-roguelike/wrogue/Manifest
index b2e0547f6179..c7f991fbea5f 100644
--- a/games-roguelike/wrogue/Manifest
+++ b/games-roguelike/wrogue/Manifest
@@ -1,4 +1,5 @@
-AUX wrogue-0.8.0b-ldflags.patch 677 BLAKE2B df5466af213d598171c5439aacacbe5c1698ea27ce15a19b0e931ed6af644c8e7a3fcac27a255f976e04979558833144159594f9c14df6d77966fbe2cc616aa3 SHA512 7ab086f4ee1f41ef6bad9dcb3e936b17389beadcbfcb451312c57ab1539992198795844264a56a5d9ef3afcc031e46d5b3e97714891723c0fe1185ba15a2d498
+AUX wrogue-0.8.0b-fix-build-system.patch 844 BLAKE2B 2d5a90199a745990f01ca0b65b55e5fee802024ba3c5869b263ab7679fb20442df9c167e0ebb0d1dfe1e63831840eb8154342781a95ffced8ffbb067253e9fde SHA512 8b9ad1cbce1c2e2a156632a4d3e3ae270fe1e30a3195fff82b8b0b4390febfde8f4cc37e6f63c4f9c891d3489b7af4c61769f56cccf718f1200b4c2dcc4435d7
+AUX wrogue-0.8.0b-string-allocation.patch 661 BLAKE2B c716bb56543535debfb18922416779b31d379bb54c7362a0e70a7377e485ebcf4878aae10f956f1a9a8506ccc8b35a6e9208fe0cf424a38ca5238481d62283a0 SHA512 d31544df6b8a92c877b8114d3f73060d99875ba56e176643a27f3b49f993efc85081a03d4eb41b2af9cc2e44094e5f9005e0fe9b8154500519eb7fc7850bd27f
 DIST wrogue-0.8.0b.zip 433553 BLAKE2B 9a634fe3b20497aab3431824e86b5905eeff90d757d15118227f9e2ffd8e5db9e81c12c43140b8dcd4b4a459f4c6b1b76ff54cf3be1d92dbfc8db5ab23a49fe2 SHA512 f8da3ccc26e36723bbf7654023cdd73747c2ffcb45420b77cc66495b596cc82ca9d90a2d239b12ea95c1185b11bad332cf41fe1b278ee34af6ff1479eb6e4d81
-EBUILD wrogue-0.8.0b-r1.ebuild 1019 BLAKE2B 4a8be6cdb1425e65714b2b644dfdc643b65fc6cc5feacbc03bfdbecd104d0a79ef638fff3eef7989391e13a726d9ce0f461dc2b4c128a7bf39409603d802d824 SHA512 456e58aef2c6b2e10ae47a98b082eba1a1cc51adabcedcb1eaa1c46d7207582b009432f911f34285d124789d1c48b62b47137208b9f07e6e9db0a55a78a95ac3
+EBUILD wrogue-0.8.0b-r1.ebuild 810 BLAKE2B 691419c8748d8662bf41059b72e9b0334e91f91bd1981a9b0fdc869bdabc9a417b2fb8a8b87393aaab909e45d898ccf14f5b45aa27a356b3d88c9b71ecf7bda0 SHA512 09bf22de0a73bb735b9e64186ad3342f41f059dfd118a7f8709b6405f5af2c123550dd10c36ca31cf8772b04f3ffcdc92b0d9df15aa5fb68c9d85244f9af8d16
 MISC metadata.xml 508 BLAKE2B 7de11c7aab57d63ea14d970499459d6d9e9293532b5d87766a2e7b4c26716599ae536aa6d4ecb640684ce917c358a5caceeb15703692fc28043a704b372a0960 SHA512 f4e516bfae05e77bc60eacecaba362ee1709b6d787271df4fa302a438ce682725cb22d7f7b81d3531d0bff548774626ce6b14ac4225e73a4057a505750ae214f
diff --git a/games-roguelike/wrogue/files/wrogue-0.8.0b-fix-build-system.patch b/games-roguelike/wrogue/files/wrogue-0.8.0b-fix-build-system.patch
new file mode 100644
index 000000000000..b17ea5c196be
--- /dev/null
+++ b/games-roguelike/wrogue/files/wrogue-0.8.0b-fix-build-system.patch
@@ -0,0 +1,47 @@
+--- a/src/linux.mak
++++ b/src/linux.mak
+@@ -18,8 +18,9 @@
+ #

+ # common compiler/linker flags

+ #

+-CFLAGS=-I./include -I./lib -std=c89 `sdl-config --cflags`

+-LDFLAGS=-lm `sdl-config --libs`

++CFLAGS+=-std=gnu99

++CPPFLAGS+=-Iinclude -Ilib -Iui -Igenerate `sdl-config --cflags`

++LDLIBS+=-lm `sdl-config --libs`

+ 

+ 

+ SRC=\

+@@ -30,7 +31,6 @@
+ OBJ=$(SRC:.c=.o)

+ EXE=./wrogue

+ 

+-CC=gcc

+ RM=rm -f

+ 

+ 

+@@ -39,9 +39,7 @@
+ # target: release 

+ #

+ .PHONY: release

+-release: CFLAGS += -pipe -O2 -fomit-frame-pointer -march=i686

+-release: LDFLAGS += -Wl,-O1

+-release: STRIP_BINARY = yes

++release: STRIP_BINARY = no

+ release: build

+ 

+ 

+@@ -89,12 +87,8 @@
+ 

+ 

+ 

+-%.o: %.c

+-	@echo Building $<

+-	@$(CC) $(CFLAGS) -o $@ -c $<

+-

+ $(EXE): $(OBJ)

+-	@$(CC) $(OBJ) $(LDFLAGS) -o $@

++	$(CC) $(LDFLAGS) $(OBJ) -o $@ $(LDLIBS)

+ 

+ 

+ 

diff --git a/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch b/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch
deleted file mode 100644
index d3ec216b4c13..000000000000
--- a/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/linux.mak	2010-10-14 11:07:22.000000000 +0200
-+++ b/src/linux.mak	2010-10-14 11:08:00.000000000 +0200
-@@ -19,7 +19,7 @@
- # common compiler/linker flags

- #

- CFLAGS=-I./include -I./lib -std=c89 `sdl-config --cflags`

--LDFLAGS=-lm `sdl-config --libs`

-+LDLIBS=-lm `sdl-config --libs`

- 

- 

- SRC=\

-@@ -40,7 +40,7 @@
- #

- .PHONY: release

- release: CFLAGS += -pipe -O2 -fomit-frame-pointer -march=i686

--release: LDFLAGS += -Wl,-O1

-+release: LDLIBS += -Wl,-O1

- release: STRIP_BINARY = yes

- release: build

- 

-@@ -94,7 +94,7 @@
- 	@$(CC) $(CFLAGS) -o $@ -c $<

- 

- $(EXE): $(OBJ)

--	@$(CC) $(OBJ) $(LDFLAGS) -o $@

-+	$(CC) $(LDFLAGS) $(OBJ) $(LDLIBS) -o $@

- 

- 

- 

diff --git a/games-roguelike/wrogue/files/wrogue-0.8.0b-string-allocation.patch b/games-roguelike/wrogue/files/wrogue-0.8.0b-string-allocation.patch
new file mode 100644
index 000000000000..66afe8ea1d7b
--- /dev/null
+++ b/games-roguelike/wrogue/files/wrogue-0.8.0b-string-allocation.patch
@@ -0,0 +1,20 @@
+--- a/src/lib/appdir.c
++++ b/src/lib/appdir.c
+@@ -149,7 +149,7 @@
+         CreateDirectory(UserData, NULL);

+ 

+         /* Determine app data directory */

+-        AppData[0] = '.'; AppData[1] = ADIR_DELIMITER; AppData[2] = '\0';

++        strcpy(AppData, "/usr/share/wrogue/");

+ 

+         /* Initialize internal data */

+         Handle = INVALID_HANDLE_VALUE;

+@@ -558,7 +558,7 @@
+         }

+ 

+         /* Determine app data directory */

+-        AppData[0] = '.'; AppData[1] = ADIR_DELIMITER; AppData[2] = '\0';

++        strcpy(AppData, "/usr/share/wrogue/");

+ 

+         /* Initialize internal data */

+         DirectoryStreamValid = ADIR_FALSE;

diff --git a/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild b/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
index 074880df4a8e..f86e97b92362 100644
--- a/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
+++ b/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
@@ -1,44 +1,38 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Gothic science fantasy roguelike game"
-HOMEPAGE="https://freecode.com/projects/wrogue"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/wrogue"
 SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="media-libs/libsdl[video]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-string-allocation.patch
 )
 
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/AppData\[0\]/ s:AppData.*:strcpy(AppData, \"/usr/share/${PN}/\");:" \
-		src/lib/appdir.c \
-		|| die "sed failed"
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
-	local myCPPFLAGS="-std=c99 -Iinclude -Ilib -Iui -Igenerate"
-	local myCFLAGS="$(sdl-config --cflags) ${CFLAGS}"
-	emake -C src -f linux.mak STRIP_BINARY=NO \
-		CFLAGS="${myCPPFLAGS} ${myCFLAGS}" release
+	emake -C src -f linux.mak release
 }
 
 src_install() {
 	dobin ${PN}
+
 	insinto /usr/share/${PN}
 	doins -r data
 	dodoc changes.txt