gentoo resync : 16.09.2020

4 files changed, 41 insertions, 29 deletions

diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
index f4924af58a2a..d2df9d38f3fe 100644
--- a/games-puzzle/gnurobbo/Manifest
+++ b/games-puzzle/gnurobbo/Manifest
@@ -1,4 +1,5 @@
-AUX gnurobbo-0.66-underlink.patch 858 BLAKE2B b3ddef3a919afd45c5d949d5f48cecaaea1c013e1924fffd8ce17e32c407562c9054059696db92750322d9378b900ce8432cc30741d0c43b86b5c6b8dd407e4c SHA512 b2053326e1e06cc780647f0c40452729430dd7d0c641406719ce48ba5159e7dd160efc9c892de9424f50ac43386cd6f2a598558e604c34be41a3ccf15d937375
-DIST gnurobbo-0.66-source.tar.gz 1765034 BLAKE2B 4a88d1281fdea44516c86e704a828e1d3ef2116cc7d6401960524ea53435828bb09f73adf57016bf3b7a0fa107ee411c575ca2f288375148658bf1bdf0b16aa2 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c
-EBUILD gnurobbo-0.66-r1.ebuild 910 BLAKE2B 8b6e1f9b6d9a76d23a64a3a60231fb28763b6669a9d4ef861fdd8e31d85fead9f77650c263c82682a9cfef2e7bdb392f8ee16858a5335358b9a95133ef7cc78d SHA512 c59070e20efad3ccf4716bfc66408c059a25215517605b6d3b4defd4bbd221b025b772b40cb34b3e01a267117e3c5d10402df74285ac4bf94834ba77e54d054e
+AUX gnurobbo-0.68-flags.patch 1105 BLAKE2B 4174fd00e12df7140516a1aa792a759e475b8b80c3c0c83c89c084daf8e7b96d74cacfeda6392f4df50760c5a87fe3a94676354bd24c6a9c904c88c1bf7058f5 SHA512 42a1e647fca531a952116859bc5804b27c1587510850a0800fbcd28c39239a4b3c8ca2aa14de37d4d710f92a50a2308c837677b59b803460a40b803a2ff98bfa
+DIST gnurobbo-0.68-single-variable-declarations.patch 41708 BLAKE2B 05de30e26be4c927c0ec23b2e2b9ce40dd4ef115928fc297235f10740286e9668ac67ac48d78e9ec5b52ce4c61b196407e1a0c5cac3af4d65e7031a9c69246ea SHA512 e8a498983bd5a8174e851f317088852e3f1ea510efa2377b71b9fe43005403a163c468ff7fdbaca2bd15524f51234de595d87b7791d24d0e9b871d1772f06854
+DIST gnurobbo-0.68-source.tar.gz 2400364 BLAKE2B bfc97fef53b8dc35fd21131557ab7f679890f20b1635268241ff0364262d2fdf7070fd889b6ebc62af8ae8740f5520de3d411acb91158382d6be0ff19c62aaeb SHA512 cf2ebfa556bf9852142c83f9d6fc304ed973d02983179fda0a7db8af0951116b6327ec7bbb462541f2678d32d4d9760e80b1c82c98a64138b25596cf1e3d52f6
+EBUILD gnurobbo-0.68.ebuild 1192 BLAKE2B ec21f80a0fa6fce69946ded40a4dc0250f1838ed8b9ed4f7789d51e5b88e471e5a7ce4e800cd9e22111049e0c7954b9056611779989976b198216756ca14bcd9 SHA512 2fd08d974c6d3d2f7349aa0a838f3c619077f24562645b919464c83b412399e97958758ca80becd9e7cbf4f21c8705101b407dff2fbe595f1f696d2ab3d7b0c2
 MISC metadata.xml 331 BLAKE2B 9e3cb9283f67936d5be789e0c65509547ddbfee86c3695ded8ff72310458e7937710915e82b2f9c9f50102b0a78ab08d3d78e5da7e05923bc53bdb69bf8b75e1 SHA512 56663c15b5d9135317f5cfdef851959613abd44ced462fc3429540a76be55970f831bfc284d2fe06ace79ea98586109bc64489ba9d12fab9a0909186f40365da
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
deleted file mode 100644
index af69bd9e1c9d..000000000000
--- a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Makefile.old	2011-06-20 21:19:49.578922392 +0200
-+++ b/Makefile	2011-06-20 21:20:28.535421648 +0200
-@@ -39,14 +39,13 @@
- CFLAGS?=-O3 -pipe
- CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
- 	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
--LDFLAGS=
- # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers)
- #CFLAGS?=-O0 -pipe -g -pg
- #CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
- #	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
- #LDFLAGS=-pg
- LINK=$(CC)
--LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
-+LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) -lm
- 
- # You won't need to alter anything below
- all: $(SOURCES) $(TARGET)
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.68-flags.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.68-flags.patch
new file mode 100644
index 000000000000..2a0f63ce8807
--- /dev/null
+++ b/games-puzzle/gnurobbo/files/gnurobbo-0.68-flags.patch
@@ -0,0 +1,22 @@
+diff --color -Naur a/Makefile b/Makefile
+--- a/Makefile	2015-08-26 21:35:29.000000000 +0100
++++ b/Makefile	2020-09-06 21:54:50.074658932 +0100
+@@ -61,16 +61,15 @@
+ 
+ 
+ 
+-CFLAGS+=-d -Wall  `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" $(SMOOTH_SCRL) $(LIGHTNING)\
++CFLAGS+=-Wall  `$(PKG_CONFIG) --cflags sdl SDL_image SDL_mixer SDL_ttf` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" $(SMOOTH_SCRL) $(LIGHTNING)\
+ 	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
+-LDFLAGS=
+ # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers)
+ #CFLAGS?=-O0 -pipe -g -pg
+ #CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
+ #	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
+ #LDFLAGS=-pg
+ LINK=$(CC)
+-LIBS=`$(SDL_CONFIG) --libs` -lm -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
++LIBS=`$(PKG_CONFIG) --libs sdl SDL_image SDL_mixer SDL_ttf` -lm
+ 
+ #for caanoo compilation
+ #LIBS=-L$(GPH_SDK)/DGE/lib/target -L$(GPH_SDK)/lib/target -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
index 39a81fdcd790..fded8903934c 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
@@ -1,17 +1,21 @@
-# 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 desktop toolchain-funcs
 
 DESCRIPTION="Robbo, a popular Atari XE/XL game ported to Linux"
 HOMEPAGE="http://gnurobbo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnurobbo/${P}-source.tar.gz"
+SRC_URI="
+	mirror://sourceforge/gnurobbo/${P}-source.tar.gz
+	https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/0.68+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> ${P}-single-variable-declarations.patch
+"
 
 LICENSE="GPL-2 BitstreamVera"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+S="${WORKDIR}/${P}/${PN}"
 
 RDEPEND="
 	media-libs/libsdl[sound,video,joystick]
@@ -21,13 +25,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+	"${DISTDIR}/${P}-single-variable-declarations.patch"
+)
 
 src_compile() {
 	emake \
-		PACKAGE_DATA_DIR="/usr/share/${PN}" \
-		BINDIR="/usr/bin" \
-		DOCDIR="/usr/share/doc/${PF}"
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		PACKAGE_DATA_DIR="${EPREFIX}/usr/share/${PN}"
 }
 
 src_install() {