gentoo resync : 12.03.2021

7 files changed, 45 insertions, 222 deletions

diff --git a/games-arcade/tecnoballz/Manifest b/games-arcade/tecnoballz/Manifest
index 985050997ed3..f1db03d06be6 100644
--- a/games-arcade/tecnoballz/Manifest
+++ b/games-arcade/tecnoballz/Manifest
@@ -1,6 +1,3 @@
-AUX tecnoballz-0.92-automake.patch 3753 BLAKE2B eebbb25a20b0916413f294764a6c5c88c686634bf722dbaf549ddb2829fb6fafab41bf41a3bcdec81c706acec3190c59acd67f3c4d9133674e083e439d1b127e SHA512 d18460a5129f97315384061858aa8f0b7d899daf3420ed442bc76840c013a732add50309d437c9dca37902b1d8820a7ff58839785017f4d314f614195c7e51d2
-AUX tecnoballz-0.92-gcc43.patch 456 BLAKE2B 01496e6a99ccf11507f0c0bdb6542551a99e7e25ef7f4cfd0005668ead93bab8f8e74ca4b7ef086f93c9f1d512422e76c62ee651a5e0a3af6c571caba2ba1ea1 SHA512 2fd980efff3bc9f1c68cd8c882cce877e1539c02fefeb241ff7c495fe2c4e872d143271cbaec45a576fd125c01fe45c4652201db9d20fb47eb51e7a372f1a2e7
-AUX tecnoballz-0.92-gcc6.patch 1583 BLAKE2B 27cab826c7f5fbd0cabd127618ab86136663865bb8d9090a78d5910c63763480d990fca36115b93a3c3743ef0fd2e61e1982fe97edd1c22dcb98ac7ae065505c SHA512 ffaa131b2d23c6cbb2cdba16443d898dd3719b54eac7f71b3c24678b4050520df19155ae92d1b095f9da4bf33cc80496ff57a4f4bcf78073dd220ce0face0c89
-DIST tecnoballz-0.92.tgz 2763879 BLAKE2B a9414c402781e9d65da5e3c0cfe4815fd80978ff874fa245237baca960278c85ba33ff2a59debf0cd6547d75e20f39afc058bd1204405ecef27d62bb8bdfdbb7 SHA512 e3868e846cdebaed6ee78050560be86557c6d01ee6512375a09eccbcf70f0cd12e419c6997a348794a41dfb75f0f3cb70321f1bb9a9bf1156a90976b0e401e13
-EBUILD tecnoballz-0.92.ebuild 1125 BLAKE2B 2f62a4d0caa111d12d0ac108545edca3662194ad3b691b45d8761ecc904b6cd84ba9ad08fcc58f806585bb56fb2b42c7fbfb7ac643098290f5110070181c5c15 SHA512 caa45f9bf8ae0ef977e99a0c4c1cac8603f52700e8b990dc8b643f2abd5f8556fe4c0c40c54f4365b3c958920671efff80becba88844a55b6e5439b4e0d329e3
-MISC metadata.xml 639 BLAKE2B ba0f916050e1914e47eec668152e2d935e537d68a54bb5d75613fe8b3a4162e8bcff96e6910230d55aa3899d2131757002d28f925aa38b9ed983467a8c070353 SHA512 edcb9678cca9ef9f537c4f2716799a5aa6a5890188173c06d9702fa99cb68411003d0aeb04e4df90faeb6efcdd024c4e494a51ed8645b7217fc073aa9916b8a5
+DIST tecnoballz-0.93.1.tar.gz 1989092 BLAKE2B b623a11b9cbb599af85cd8a8cae712dc6403cc0e406f0ecee00f92e571a94db9ea3b8446d3abf9e6992fcb680775ea5e83cb5c58b563c71ddf83c6a969ac4e69 SHA512 5ccbff786398b191f56809180e7309a1e183852f69f51c1797e9e5db5e7ef04d8daa37940c31c2d5ab6911974d140da5d88d81d668122a0ffc37938ef856702b
+EBUILD tecnoballz-0.93.1.ebuild 828 BLAKE2B f2df8ed7267b29ed631e9485db86f558481c934b526a20c053d18ab6f93909bf3238985ca45b5e72faf1dde7b605a2c2f2bbff746d1b13be69f07e694c9834e3 SHA512 57be9347b57c12020da516b43da06231c0ceec213292d7266f380c2be8b6251db32dfb5a69f4802c31fb207392e62130a7c3582ed896ace15c5864c897a94ba1
+MISC metadata.xml 723 BLAKE2B 91b24860dca2d3dd12622f6b257ff23936080dc568434f0281c94b791c503f56cf1bc7cb6f381437ca517679bf5b83e0430b312061832ce8a4af44236e811f2a SHA512 b601747202842bbf24627863a337684da2fd5f39c3ca7583880f00317bf7444a75743bb913cd8fa301362271754f3294e7b72c2e1fa7f9bc7d1fb09b95e79940
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch
deleted file mode 100644
index b2f0379e4899..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- Makefile.am.old	2008-10-07 10:42:11.000000000 +0200
-+++ Makefile.am	2008-10-07 10:49:35.000000000 +0200
-@@ -1,18 +1,6 @@
- 
--gamesdir = $(prefix)/games
--scoredir = /var/games/tecnoballz
--score = tecnoballz.hi
-+localstate_DATA = tecnoballz.hi
- 
--SUBDIRS = src 
-+SUBDIRS = src man
- 
--pkgdatadir = $(mandir)/man6
--dist_pkgdata_DATA = man/tecnoballz.6
--
--install-data-hook:
--	-chown root:games "$(DESTDIR)/$(gamesdir)/tecnoballz"
--	-chmod 2755 "$(DESTDIR)/$(gamesdir)/tecnoballz"
--	$(INSTALL) -d $(DESTDIR)/$(scoredir)
--	$(INSTALL) $(score) $(DESTDIR)/$(scoredir) 
--	-chown root:games "$(DESTDIR)/$(scoredir)/$(score)"
--	-chmod 664 "$(DESTDIR)/$(scoredir)/$(score)"
- 
---- src/Makefile.am.old	2008-10-07 11:16:44.000000000 +0200
-+++ src/Makefile.am	2008-10-07 11:18:32.000000000 +0200
-@@ -1,14 +1,12 @@
- 
- NULL =
--gamesdir = $(prefix)/games
--scoredir = /var/games/tecnoballz
- score = tecnoballz.hi
- 
- SUBDIRS = TecnoballZ 
- 
--games_PROGRAMS = tecnoballz
-+bin_PROGRAMS = tecnoballz
- tecnoballz_SOURCES = $(SOURCES_MAIN) 
--tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ 
-+tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(localstatedir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ 
- tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -L.
- 
- SOURCES_MAIN = \
---- src/TecnoballZ/Makefile.am.old	2008-10-07 17:17:47.000000000 +0200
-+++ src/TecnoballZ/Makefile.am	2008-10-07 17:20:03.000000000 +0200
-@@ -1,6 +1,6 @@
- NULL =
- 
--SUBDIRS = lores hires textures sounds musics
-+SUBDIRS = lores hires textures sounds musics texts
- 
- pkgdatadir = $(datadir)/tecnoballz
- dist_pkgdata_DATA = \
-@@ -14,4 +14,5 @@
-   tilemap-guardians_40.data \
-   tilemap-menu_20.data \
- 	tilemap-menu_40.data \
-+	levels-data.xml \
- 	$(NULL)
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ src/TecnoballZ/texts/Makefile.am	2008-10-07 17:30:18.000000000 +0200
-@@ -0,0 +1,11 @@
-+textsdir = $(pkgdatadir)/texts
-+texts_DATA = main_menu_en.txt \
-+	main_menu_fr.txt \
-+	popup_menu_en.txt \
-+	popup_menu_fr.txt \
-+	scrolltext_en.txt \
-+	scrolltext_fr.txt \
-+	shop_en.txt \
-+	shop_fr.txt \
-+	short_info_messages_en.txt \
-+	short_info_messages_fr.txt
---- configure.ac.old	2008-10-08 23:10:26.000000000 +0200
-+++ configure.ac	2008-10-08 23:11:08.000000000 +0200
-@@ -50,21 +50,6 @@
- 
- LDFLAGS_="${LDFLAGS_save}"
- 
--AC_CHECK_LIB(vorbisfile, ov_raw_seek, [
--	MM_LIBS="${MM_LIBS} -lvorbisfile"
--],[
--	AC_MSG_ERROR(Could not find the vorbisfile lib : -lvorbisfile)
--])
--AC_CHECK_LIB(ogg, ogg_stream_packetin, [
--	MM_LIBS="${MM_LIBS} -logg"
--],[
--	AC_MSG_ERROR(Could not find the ogg lib : -logg)
--])
--AC_CHECK_LIB(smpeg, SMPEG_play, [
--	MM_LIBS="${MM_LIBS} -lsmpeg"
--],[
--	AC_MSG_ERROR(Could not find the smpeg lib : -lsmpeg)
--])
- AC_SUBST(MM_LIBS)
- 
- AC_CHECK_LIB(mikmod, Player_Stop, [
-@@ -81,5 +81,8 @@
- 
- 
- dnl  Output makefiles
--AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile)
-+AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile
-+	src/TecnoballZ/texts/Makefile
-+	man/Makefile
-+	man/fr/Makefile)
- 
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ man/Makefile.am	2008-10-08 10:36:15.000000000 +0200
-@@ -0,0 +1,2 @@
-+SUBDIRS = fr
-+man_MANS = tecnoballz.6
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ man/fr/Makefile.am	2008-10-08 10:36:15.000000000 +0200
-@@ -0,0 +1,2 @@
-+mandir = @mandir@/fr
-+man_MANS = tecnoballz.6
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch
deleted file mode 100644
index ae190abd64c6..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/surface_sdl.h.old	2008-10-07 10:16:25.000000000 +0200
-+++ include/surface_sdl.h	2008-10-07 10:16:38.000000000 +0200
-@@ -46,7 +46,7 @@
-   ~surface_sdl ();
-   SDL_Surface* get_surface ();
-   char* get_pixel_data ();
--  char* get_pixel_data (Uint32 coord_x, Uint32 coord_x);
-+  char* get_pixel_data (Uint32 coord_x, Uint32 coord_y);
-   Uint32 get_row_size ();
-   Uint32 get_offset (Uint32 xcoord, Uint32 ycoord);
-   void clear (Uint32 color = 0);
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch
deleted file mode 100644
index f06a2ac2a0db..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=610974
-Commit: https://github.com/brunonymous/tecnoballz/commit/29c5f137555897c8fb73b4780295524b214b24a2
-
---- a/include/tiles_background.h
-+++ b/include/tiles_background.h
-@@ -47,7 +47,7 @@
-     static tiles_background* tiles_background_singleton;
-     static Sint32 table_pos1[16];
-     static Sint32 table_pos2[16];
--    static char couleurs[448];
-+    static unsigned char couleurs[448];
-     static const Sint32 TILES_32_WIDTH = 32;
-     static const Sint32 TILES_32_HEIGHT = 32;
-     static const Sint32 TILES_64_WIDTH = 64;
-@@ -63,7 +63,7 @@
-      * or TILES_32x32_WITH_4_COLORS */
-     Uint32 type_of_tiles;
-     /** 4 color palette index */
--    Uint32 palette_index;
-+    Sint32 palette_index;
- 
-     bitmap_data *current_tiles;
-     Uint32 *map_tiles;
---- a/src/tiles_background.cc
-+++ b/src/tiles_background.cc
-@@ -663,8 +663,8 @@
- 
-     }
-   palette_index = pal_index;
--  char *color = &couleurs[0];
--  unsigned char *colPT = (unsigned char *) (color) + pal_index;
-+  unsigned char *color = &couleurs[0];
-+  unsigned char *colPT = (color) + pal_index;
-   SDL_Color *pal = display->get_palette ();
-   SDL_Color *lighted = pal + 1;
-   SDL_Color *dark = lighted + 128;
-@@ -702,7 +702,7 @@
-  * 4 * 4    : 16 composantes by palette
-  * 112 * 4  : 448 composantes
- */
--char
-+unsigned char
- tiles_background::couleurs[448] = {
-                                     0x00, 0x40, 0x20, 0x40, 0x00, 0x60, 0x40, 0x60, 0x00, 0x80, 0x60, 0x80,
-                                     0x00, 0xA0, 0x80, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x00, 0x20,
diff --git a/games-arcade/tecnoballz/metadata.xml b/games-arcade/tecnoballz/metadata.xml
index 5dbd2510d79a..0fac86988986 100644
--- a/games-arcade/tecnoballz/metadata.xml
+++ b/games-arcade/tecnoballz/metadata.xml
@@ -12,4 +12,7 @@ attack weapons with an enormous power of fire that can be build by gaining
 bonuses. Numerous decors, musics and sounds complete this great game. This
 game was ported from the Commodore Amiga.
 </longdescription>
+<upstream>
+	<remote-id type="github">brunonymous/tecnoballz</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
deleted file mode 100644
index 272be1639d8f..000000000000
--- a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools games
-
-DESCRIPTION="An exciting Brick Breaker"
-HOMEPAGE="http://linux.tlk.fr/games/TecnoballZ/"
-SRC_URI="http://linux.tlk.fr/games/TecnoballZ/download/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-image[png]
-	media-libs/libmikmod:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc6.patch \
-		"${FILESDIR}"/${P}-automake.patch
-	mv man/${PN}.fr.6 man/fr/${PN}.6 || die
-	# don't combine explicit and implicit rules for make 3.82 (bug #334629)
-	sed -i -e '/supervisor.c /s/.c /.cc /' src/Makefile.am || die
-	sed -i -e '/^CXXFLAGS=/d' configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	fperms g+w "${GAMES_STATEDIR}"/${PN}.hi
-	make_desktop_entry ${PN} Tecnoballz
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	has_version "media-libs/sdl-mixer[mikmod]" \
-		|| ewarn "To have background music, emerge sdl-mixer with USE=mikmod"
-	games_pkg_postinst
-}
diff --git a/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild b/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild
new file mode 100644
index 000000000000..71150e1504fd
--- /dev/null
+++ b/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="An exciting Brick Breaker"
+HOMEPAGE="http://linux.tlk.fr/games/TecnoballZ/"
+SRC_URI="https://github.com/brunonymous/tecnoballz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/tinyxml
+	media-libs/libsdl[joystick]
+	media-libs/sdl-mixer[mikmod]
+	media-libs/sdl-image[png]
+	media-libs/libmikmod:0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	mkdir man/fr || die
+	mv man/${PN}.fr.6 man/fr/${PN}.6 || die
+
+	sed -i -e 's:\$(prefix)/games:\$(prefix)/bin:' src/Makefile.am || die
+	sed -i -e '/CXXFLAGS=/d' -e '/^else/d' configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN} Tecnoballz
+}