gentoo resync : 16.09.2020

11 files changed, 80 insertions, 62 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 07a7563dae7a..5c27c16119a4 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest
index 6adfae12cfbc..d1017e167898 100644
--- a/games-puzzle/atomix/Manifest
+++ b/games-puzzle/atomix/Manifest
@@ -1,5 +1,4 @@
-DIST atomix-3.22.0.tar.xz 551424 BLAKE2B be2c9c60a5e526ce810d8742bf3b799edc8aea8b493ddc0beb356dce2aef9f4daa6b38c885c2b48e7ce7fff80685522d546fddc134cd2d06c6cb72128522a52e SHA512 111c1d1cbd4e07ef7fdfa6d6431b2b7f460dfcceabd1460675640c3965e7f40fb145c921d27e0f3c06605e943190fd36af6d6d462533dca207b8d29487470212
+AUX atomix-3.34.0-fnocommon.patch 978 BLAKE2B 6de4af3e3d8e85954826b50608454b63340a9ad1bd1570aa15fa6b7fd0b92dda8253899b2c5a1f5de27de687398a347a418db17f5e7d2eb2c7403ed8388d1826 SHA512 efba64055b78077851bc9c60bd64378581cce60434972116803788c9703000fa1700141c5d942ec2026d46f426fdc5564a830cd84849a76f9e193e0142511309
 DIST atomix-3.34.0.tar.xz 532096 BLAKE2B bec3e29b2a3ef92e86b4c6e3c68f31d80b4e5fae9c2fbf86229813a4ce4aef469c94a21a51a102b556cae0764eb553e18301246d94ed475f64ec6fcfe226c784 SHA512 e51e8b727c80a1ea7078ac16d15884c7c84b06aba456424e659c3965fe7c2b3d0c68e0d3d2dd40224afd07b4f7a261e7510327e58974a94fe58c9a81d67c0937
-EBUILD atomix-3.22.0.ebuild 535 BLAKE2B 555c47c9d8226b8b229ec3783770453f8a657891618c55e436219b4378b1ee6b1ba601a8212b79c1e6c751db24edc702f6ffc0936b689c570d68b3ad8231697a SHA512 7551095fc1489cfdef0b86d4bb8e29e36bfe2f8439ec27bcb75acf5ed2245d9bc44bc913d817a861f43db5b215bcaaafb7f1e1659384ed1e213af07f52373acb
-EBUILD atomix-3.34.0.ebuild 504 BLAKE2B d5fd121234796c880935bd101005e5daa664cd61b5069509d0ab4fe17bec7d6a7ba886c214e942e62cd8ae005c2c284bab16dbb0e1f46b90d0614c0427e418ad SHA512 47eb8c4b25b12ab4a33fd3cdacf94db99298e3a033a79f4430f294a4a251a54b36ad3c508e6f9095181833ee66249d5f2e5b8ec9b60973c39c81cabbe4b3e1fb
+EBUILD atomix-3.34.0-r1.ebuild 565 BLAKE2B 94e82e276fc278d6104bc91150364264178c333a8aa5338162bfdce2884308bac10b1c91defc99f1bc70d2ed1f8a58e84055ac8a04bed7cb8806bbf7688a863f SHA512 e1e554f96b0a84feef695de4c66761e5a749a711c883d97ebda70fae1e7f5851cb6c2a74da5fa46faf17b5eba63ace1f110b38d9aff2b30218cc4b725f8ade60
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/atomix/atomix-3.22.0.ebuild b/games-puzzle/atomix/atomix-3.22.0.ebuild
deleted file mode 100644
index a5b20639ca59..000000000000
--- a/games-puzzle/atomix/atomix-3.22.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Build molecules, from simple inorganic to extremely complex organic ones"
-HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gdk-pixbuf-2.0.5:2
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/atomix/atomix-3.34.0.ebuild b/games-puzzle/atomix/atomix-3.34.0-r1.ebuild
index 567ab569393e..75c5b6489394 100644
--- a/games-puzzle/atomix/atomix-3.34.0.ebuild
+++ b/games-puzzle/atomix/atomix-3.34.0-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit gnome.org meson xdg
 
 DESCRIPTION="Mind game - build molecules out of single atoms"
@@ -18,7 +19,12 @@ RDEPEND="
 	>=dev-libs/glib-2.36.0:2
 	dev-libs/libgnome-games-support:=
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
+
+PATCHES=(
+	"${FILESDIR}/${P}-fnocommon.patch"
+)
diff --git a/games-puzzle/atomix/files/atomix-3.34.0-fnocommon.patch b/games-puzzle/atomix/files/atomix-3.34.0-fnocommon.patch
new file mode 100644
index 000000000000..7465fb23a6e2
--- /dev/null
+++ b/games-puzzle/atomix/files/atomix-3.34.0-fnocommon.patch
@@ -0,0 +1,26 @@
+Fixes build with -fno-common
+
+diff -Nurp atomix-3.34.0/src/level.c atomix-3.34.0-fix/src/level.c
+--- atomix-3.34.0/src/level.c	2019-09-09 19:14:36.000000000 -0000
++++ atomix-3.34.0-fix/src/level.c	2020-09-12 23:21:04.917492187 -0000
+@@ -31,7 +31,7 @@ static void level_class_init (GObjectCla
+ static void level_init (Level *level);
+ static void level_finalize (GObject *object);
+ 
+-GObjectClass *parent_class;
++static GObjectClass *parent_class;
+ 
+ /*=================================================================
+  
+diff -Nurp atomix-3.34.0/src/theme.c atomix-3.34.0-fix/src/theme.c
+--- atomix-3.34.0/src/theme.c	2019-09-09 19:14:36.000000000 -0000
++++ atomix-3.34.0-fix/src/theme.c	2020-09-12 23:21:19.557735891 -0000
+@@ -32,7 +32,7 @@ static void theme_init (Theme *theme);
+ static void theme_finalize (GObject *object);
+ static void destroy_theme_image (gpointer data);
+ 
+-GObjectClass *parent_class;
++static GObjectClass *parent_class;
+ 
+ GType theme_get_type (void)
+ {
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() {
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
index 73ecb2a9d92c..4177bee11980 100644
--- a/games-puzzle/xye/Manifest
+++ b/games-puzzle/xye/Manifest
@@ -2,5 +2,5 @@ AUX xye-0.12.2-fix-buildsystem.patch 1020 BLAKE2B 6408b6df99db5ca103183a7cee8905
 AUX xye-0.12.2-fix-c++14.patch 502 BLAKE2B e3116515757af9e84d5bac340947df1e88e768058a3dfb65e0894388ad8e0fa98f63e6c16314e35b288fff8639d8f46972999c031e077d3417218c09bc9c00a7 SHA512 c9dcc309b5e451f1608174de4f6016d006879d2267627eebe8ff524af293137af90f4761c8eacbc5ebd9ee633cc7d087e23eb3e7c4970f5484e065dfa8dff3af
 AUX xye-0.12.2-fix-desktop-file.patch 414 BLAKE2B 3d4f87e6db2144407eaf5161d73184d23eabd4742dbc1f68e59d8932257491eb429d68d12d910ee311fdbafecd4c118a6ad9f9b3b225157384035868ced3ee48 SHA512 c798ed5da4e45b0a8d5aaa4dd77fe09d9cb08837a33b44a5c69f89e4d2456fb5964c4fc5646a83fd6166d315200924944ab6dd7eea3f983e4be403a8f14f8c9e
 DIST xye-0.12.2.tar.gz 2860290 BLAKE2B 426cd4afb84c0de8bdbafe9b63d0da2f686593449b4577ae0eb77e38364bcac166cb9bf4a3a41f7d15a0a1745bc9574f959e0429998c00ad78a6fe40c49093f1 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa
-EBUILD xye-0.12.2.ebuild 932 BLAKE2B c77382cd8764e3425d8c257e9f36f3d91af9b8df27ef71c9bfff3102c739c7e1e907d7fff57da861025d704afac45086be9b90d4ab45b45ac6078f98e013ae65 SHA512 9b0c88bc789e73608ff3fb297c04a83cb1eca221130a3ca53148f170b187ac7f87b86181233535e8955ef0f944b5db5e7660f424d501ff608328fe83ba3322d7
+EBUILD xye-0.12.2.ebuild 933 BLAKE2B b1057bf7efbf494560e061c1ff8c6340b6911405eedeee52cc6c238b06c59430bf1656c6f1ae022a60aa580af00a52e1061e732c3591c799ac22c922b0edce41 SHA512 c22d78ace9f2da94a7ca966b7b3b9579860b2e48f46d5c85ff787d10d1a7e773c9388453cbb56739692e824284e50ce5d77bae680ad6bb545ab06b5f2751af77
 MISC metadata.xml 326 BLAKE2B 8f368cb2e89ca46600917931c95285943f8ededa8a3c1c6fe1602a11c68a00f53429be467d28a49cf9a0989cb6b6f0cfa70ded461f2b6f9adeb86e8c05a49e52 SHA512 05084d9dcce50a1d4302a83cb89abd67519143384ff6c1ca3f84e10db468483cf90e4d10c240dc58f47b10df747725c86514db303efaeca048d44a3085bb7fe6
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
index ed474f123243..dd5d31b2b2a0 100644
--- a/games-puzzle/xye/xye-0.12.2.ebuild
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="Free version of the classic game Kye"
 HOMEPAGE="http://xye.sourceforge.net/"