gentoo resync : 25.10.2021

5 files changed, 87 insertions, 433 deletions

diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest
index dea5d0b513ff..d99a86c4eb8e 100644
--- a/games-strategy/tornado/Manifest
+++ b/games-strategy/tornado/Manifest
@@ -1,4 +1,4 @@
-AUX tornado-1.4-r2-gentoo.patch 13288 BLAKE2B 35b3eb05fd6894ec5733e42b2423f19f3ef4ff2e71b90f6f71380fdaec0ad862caafd15a8fb7f0785927f8fee0fdead741dc4bfb34343b510fd330ac649f893e SHA512 683a5dcac5fc12b065ebb4dfc5c9972a6fe6c87ee645cdbdf038313068ae43cc1e022ad8772c6f509f7bc102862bda6cc34ce5ccf132fc06f7d1cabd2d93817a
+AUX tornado-1.4-make.patch 686 BLAKE2B ac38bc4ce5350ed5e8f0a2389abb11da5fee6704e26aff3596cc9d99d12a57816c371452fb9806913277cc15bb485a49370908e35947c55e62ec5dd454bb7ac7 SHA512 ab651acadb5fb94d71d0acdc2878428837ccf48f487e14e016c447c46f77b9249c9006f694dcfc29e70b53164a5567af3e9c3c3d2f7a6dd2f2f2f99e650e8e0b
 DIST tornado-1.4.tar.gz 56341 BLAKE2B 81b99ab6484c5267c90792cfefb9dad638d8057224e4eb755dde85638e17bfb5cc17fe64bf84b0d631905493e8e1e276f0842b4f9bbe2eb40e740931a8f422a8 SHA512 32a9e078c0d0498befff78f5cafaa1e45ee2ad45d661f7d89e9038f8ca44c34b27ca846e3e4d68a15f203da20b5f6aeb41826c00159d66d9640f3b2bdd6b6e12
-EBUILD tornado-1.4-r2.ebuild 777 BLAKE2B 002f92d9d73b2e4681bcb8df4bb90efa241508c1b7226d3c0221565ba3e11f1e2966f7fad7b1f359120621ced18d9690c49a3a4b8a88c5302ffc7daa2f97f28b SHA512 829a2780c60293bd29022e9752ecdf73f817a0e148ae47305bf8fc08b9be0629513b2d7630113e7a2bd23b9900fbcd6225efc67ffb72aa5e8791b54942e66c6d
+EBUILD tornado-1.4-r3.ebuild 1296 BLAKE2B 7b2febced2d4df921355b31f0eb7c44c8118a124fe5c3aa72c7a9faaf21792840c1aae34eef53d287d39cbb3d2a94eeeff94d4f2e1421d1790ac2e8f1c437326 SHA512 2908e20354f63aa68b67ada001b4fbaefb0831635a870577dce90f3411f9a15c3680b0b9fa593c92cab4685f3064241784b6157aaafc8096a16e6357505edde3
 MISC metadata.xml 325 BLAKE2B 82fdbd00f9118c6b2f0e82e6ce8112df4fb21f561a6a02f4e19a4eb43b32b7b0b9d26ce0f1963313245b62da620895c4eae552e56c7271b558b19bcdc4bb1a81 SHA512 e885623394b7657878077160916cb44aad4f32b6eb7add9ff3afef7f75b4ee2dad1e8bc98777f89f4bb3f1120610fb34836b87c285be8e95227e2f86868ba335
diff --git a/games-strategy/tornado/files/tornado-1.4-make.patch b/games-strategy/tornado/files/tornado-1.4-make.patch
new file mode 100644
index 000000000000..1dc2ac703446
--- /dev/null
+++ b/games-strategy/tornado/files/tornado-1.4-make.patch
@@ -0,0 +1,19 @@
+Respect flags and use pkg-config.
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,2 @@
+-CC = gcc
+-MAKE = make
+-LDFLAGS = -lncurses
++LIBS := $(shell $(PKG_CONFIG) --libs ncurses) $(LIBS)
+ OBJFILES = main.o draw.o erwin.o network.o scores.o
+@@ -6,3 +4,3 @@
+ LOCALEPATH = /usr/local/share/locale
+-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" 
++CFLAGS := $(CFLAGS) -Wall -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" $(shell $(PKG_CONFIG) --cflags ncurses) $(CPPFLAGS)
+ VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
+@@ -27,3 +25,3 @@
+ tornado: $(OBJFILES)
+-	$(CC) $(LDFLAGS) $(OBJFILES) -o tornado
++	$(CC) $(LDFLAGS) $(OBJFILES) -o tornado $(LIBS)
+ 
diff --git a/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
deleted file mode 100644
index 72951781f3e2..000000000000
--- a/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
+++ /dev/null
@@ -1,388 +0,0 @@
---- a/doc/man/de/Makefile
-+++ b/doc/man/de/Makefile
-@@ -9,10 +9,10 @@
- 
- install-man: tornado.6
- 	@echo "Installing german manpage ..."
--	if [ ! -d "$(PREFIX)/man/de/man6" ]; then \
--	  mkdir -p $(PREFIX)/man/de/man6; \
-+	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/de/man6" ]; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/de/man6; \
- 	fi
--	install -m 0644 tornado.6 $(PREFIX)/man/de/man6
-+	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/de/man6
- 
- clean:
- 	rm -f tornado.6
---- a/doc/man/fr/Makefile
-+++ b/doc/man/fr/Makefile
-@@ -9,10 +9,10 @@
- 
- install-man: tornado.6
- 	@echo "Installing French manpage ..."
--	if [ ! -d "$(PREFIX)/man/fr/man6" ]; then \
--	  mkdir -p $(PREFIX)/man/fr/man6; \
-+	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/fr/man6" ]; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/fr/man6; \
- 	fi
--	install -m 0644 tornado.6 $(PREFIX)/man/fr/man6
-+	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/fr/man6
- 
- clean:
- 	rm -f tornado.6
---- a/doc/man/it/Makefile
-+++ b/doc/man/it/Makefile
-@@ -9,10 +9,10 @@
- 
- install-man: tornado.6
- 	@echo "Installing Italian manpage ..."
--	if [ ! -d "$(PREFIX)/man/it/man6" ]; then \
--	  mkdir -p $(PREFIX)/man/it/man6; \
-+	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/it/man6" ]; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/it/man6; \
- 	fi
--	install -m 0644 tornado.6 $(PREFIX)/man/it/man6
-+	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/it/man6
- 
- clean:
- 	rm -f tornado.6
---- a/doc/man/Makefile
-+++ b/doc/man/Makefile
-@@ -15,10 +15,10 @@
- 
- install-man: tornado.6
- 	@echo "Installing manpage ..."
--	if [ ! -d "$(PREFIX)/man/man6" ]; then \
--	  mkdir -p $(PREFIX)/man/man6; \
-+	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/man6" ]; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man6; \
- 	fi
--	install -m 0644 tornado.6 $(PREFIX)/man/man6
-+	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/man6
- 	$(MAKE) -C de install-man
- 	$(MAKE) -C fr install-man
- 	$(MAKE) -C it install-man
---- a/doc/man/nl/Makefile
-+++ b/doc/man/nl/Makefile
-@@ -9,10 +9,10 @@
- 
- install-man: tornado.6
- 	@echo "Installing Dutch manpage ..."
--	if [ ! -d "$(PREFIX)/man/nl/man6" ]; then \
--	  mkdir -p $(PREFIX)/man/nl/man6; \
-+	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/nl/man6" ]; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/nl/man6; \
- 	fi
--	install -m 0644 tornado.6 $(PREFIX)/man/nl/man6
-+	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/nl/man6
- 
- clean:
- 	rm -f tornado.6
---- a/doc/man/no/Makefile
-+++ b/doc/man/no/Makefile
-@@ -9,10 +9,10 @@
- 
- install-man: tornado.6
- 	@echo "Installing Norwegian manpage ..."
--	if [ ! -d "$(PREFIX)/man/no/man6" ]; then \
--	  mkdir -p $(PREFIX)/man/no/man6; \
-+	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/no/man6" ]; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/no/man6; \
- 	fi
--	install -m 0644 tornado.6 $(PREFIX)/man/no/man6
-+	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/no/man6
- 
- clean:
- 	rm -f tornado.6
---- a/doc/man/ru/Makefile
-+++ b/doc/man/ru/Makefile
-@@ -9,10 +9,10 @@
- 
- install-man: tornado.6
- 	@echo "Installing Russian manpage ..."
--	if [ ! -d "$(PREFIX)/man/ru/man6" ]; then \
--	  mkdir -p $(PREFIX)/man/ru/man6; \
-+	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/ru/man6" ]; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/ru/man6; \
- 	fi
--	install -m 0644 tornado.6 $(PREFIX)/man/ru/man6
-+	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/ru/man6
- 
- clean:
- 	rm -f tornado.6
---- a/Makefile
-+++ b/Makefile
-@@ -1,10 +1,9 @@
--CC = gcc
- MAKE = make
--LDFLAGS = -lncurses
-+LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses)
- OBJFILES = main.o draw.o erwin.o network.o scores.o
--PREFIX = /usr/local
--LOCALEPATH = /usr/local/share/locale
--CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" 
-+PREFIX = /usr
-+LOCALEPATH = /usr/share/locale
-+CFLAGS += -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
- VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
- LOCALES = de
- MAN = doc/man
-@@ -25,7 +24,7 @@
- 	$(MAKE) -C $(MAN) all
- 
- tornado: $(OBJFILES)
--	$(CC) $(LDFLAGS) $(OBJFILES) -o tornado
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJFILES) $(LDLIBS) -o tornado
- 
- debug: tornado.6 locales
- 	gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" 
-@@ -43,25 +42,24 @@
- 
- install: tornado tornado.6 install-locale-data
- 	@echo "Installing tornado binary in $(PREFIX)/bin..."
--	if [ ! -d "$(PREFIX)/bin" ]; then \
--	  mkdir -p $(PREFIX)/bin; \
-+	if [ ! -d "$(DESTDIR)/$(PREFIX)/bin" ]; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/bin; \
- 	fi
--	install -s tornado $(PREFIX)/bin
-+	install tornado $(DESTDIR)/$(PREFIX)/bin
- 
- 	$(MAKE) -C $(MAN) install-man
- 
-+	if [ ! -d "$(DESTDIR)/var/games" ]; then \
-+	  mkdir -p $(DESTDIR)/var/games; \
-+	fi; \
- 	if [ -f "/var/games/tornado.scores" ]; then \
- 	  echo "Skipping install of the highscores file. File exists."; \
- 	  cat /var/games/tornado.scores | ./convert-highscorefile > score.tmp; \
--	  mv -f score.tmp /var/games/tornado.scores; \
--	  chmod a+rw-x "/var/games/tornado.scores"; \
--	else \
--	  if [ ! -d "/var/games" ]; then \
--	    mkdir /var/games; \
--	  fi; \
--	  install tornado.scores /var/games; \
--	  chmod a+w-x "/var/games/tornado.scores"; \
--	fi
-+	  mv -f score.tmp $(DESTDIR)/var/games/tornado.scores; \
-+    else \
-+      install tornado.scores $(DESTDIR)/var/games; \
-+	fi; \
-+	chmod a+w-x "$(DESTDIR)/var/games/tornado.scores";
- 
- install-locale-data:
- 	$(MAKE) -C po install-locale-data
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -1,9 +1,3 @@
--CC = gcc
--MAKE = make
--LDFLAGS = -lncurses
--OBJFILES = main.o draw.o erwin.o network.o scores.o
--PREFIX = /usr/local
--LOCALEPATH = /usr/local/share/locale
--CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
--LOCALES = de
-+PREFIX = /usr
-+LOCALEPATH = /usr/share/locale
- MAN = doc/man
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -14,38 +14,38 @@
- 	msgfmt no.po -o no.mo
- 
- install-locale-data: de.mo fr.mo pt.mo es.mo it.mo ru.mo nl.mo no.po
--	if [ ! -d "$(LOCALEPATH)/de/LC_MESSAGES/" ]; then \
--	  mkdir -p $(LOCALEPATH)/de/LC_MESSAGES/; \
-+	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/" ]; then \
-+	  mkdir -p $(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/; \
- 	fi
--	install -m 0644 de.mo $(LOCALEPATH)/de/LC_MESSAGES/tornado.mo
--	if [ ! -d "$(LOCALEPATH)/fr/LC_MESSAGES/" ]; then \
--	  mkdir -p $(LOCALEPATH)/fr/LC_MESSAGES/; \
--	fi
--	install -m 0644 fr.mo $(LOCALEPATH)/fr/LC_MESSAGES/tornado.mo
--	if [ ! -d "$(LOCALEPATH)/pt/LC_MESSAGES/" ]; then \
--	  mkdir -p $(LOCALEPATH)/pt/LC_MESSAGES/; \
--	fi
--	install -m 0644 pt.mo $(LOCALEPATH)/pt/LC_MESSAGES/tornado.mo
--	if [ ! -d "$(LOCALEPATH)/es/LC_MESSAGES/" ]; then \
--	  mkdir -p $(LOCALEPATH)/es/LC_MESSAGES/; \
--	fi
--	install -m 0644 es.mo $(LOCALEPATH)/es/LC_MESSAGES/tornado.mo
--	if [ ! -d "$(LOCALEPATH)/it/LC_MESSAGES/" ]; then \
--	  mkdir -p $(LOCALEPATH)/it/LC_MESSAGES/; \
--	fi
--	install -m 0644 it.mo $(LOCALEPATH)/it/LC_MESSAGES/tornado.mo
--	if [ ! -d "$(LOCALEPATH)/ru/LC_MESSAGES/" ]; then \
--	  mkdir -p $(LOCALEPATH)/ru/LC_MESSAGES/; \
--	fi
--	install -m 0644 ru.mo $(LOCALEPATH)/ru/LC_MESSAGES/tornado.mo
--	if [ ! -d "$(LOCALEPATH)/nl/LC_MESSAGES/" ]; then \
--	  mkdir -p $(LOCALEPATH)/nl/LC_MESSAGES/; \
--	fi
--	install -m 0644 nl.mo $(LOCALEPATH)/nl/LC_MESSAGES/tornado.mo
--	if [ ! -d "$(LOCALEPATH)/no/LC_MESSAGES/" ]; then \
--	  mkdir -p $(LOCALEPATH)/no/LC_MESSAGES/; \
-+	install -m 0644 de.mo $(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/tornado.mo
-+	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/" ]; then \
-+	  mkdir -p $(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/; \
-+	fi
-+	install -m 0644 fr.mo $(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/tornado.mo
-+	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/" ]; then \
-+	  mkdir -p $(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/; \
-+	fi
-+	install -m 0644 pt.mo $(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/tornado.mo
-+	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/" ]; then \
-+	  mkdir -p $(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/; \
-+	fi
-+	install -m 0644 es.mo $(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/tornado.mo
-+	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/" ]; then \
-+	  mkdir -p $(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/; \
-+	fi
-+	install -m 0644 it.mo $(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/tornado.mo
-+	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/" ]; then \
-+	  mkdir -p $(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/; \
-+	fi
-+	install -m 0644 ru.mo $(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/tornado.mo
-+	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/" ]; then \
-+	  mkdir -p $(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/; \
-+	fi
-+	install -m 0644 nl.mo $(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/tornado.mo
-+	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/" ]; then \
-+	  mkdir -p $(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/; \
- 	fi
--	install -m 0644 no.mo $(LOCALEPATH)/no/LC_MESSAGES/tornado.mo
-+	install -m 0644 no.mo $(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/tornado.mo
- 
- clean:
- 	rm -f *.mo
---- a/doc/man/de/tornado.6.de.in
-+++ b/doc/man/de/tornado.6.de.in
-@@ -90,13 +90,13 @@
- .SH FILES
- PREFIX/bin/tornado
- .P
--PREFIX/man/man6/tornado.6
-+/usr/share/man/man6/tornado.6
- .P
- /var/games/tornado.scores
- .P
--/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
-+/usr/share/locale/de/LC_MESSAGES/tornado.mo
- .P
--/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
-+/usr/share/locale/fr/LC_MESSAGES/tornado.mo
- .SH NOTES
- Wenn das Spiel im Netzwerkmodus läuft sollte auf beiden Seiten die selbe
- Version laufen. Versionen vor 1.0pre4 funktionieren damit überhaupt nicht,
---- a/doc/man/fr/tornado.6.fr.in
-+++ b/doc/man/fr/tornado.6.fr.in
-@@ -72,13 +72,13 @@
- .SH FICHIERS
- PREFIX/bin/tornado
- .P
--PREFIX/man/man6/tornado.6
-+/usr/share/man/man6/tornado.6
- .P
- /var/games/tornado.scores
- .P
--/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
-+/usr/share/locale/de/LC_MESSAGES/tornado.mo
- .P
--/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
-+/usr/share/locale/fr/LC_MESSAGES/tornado.mo
- .SH NOTES
- Pour jouer en mode réseau, le client et le serveur doivent avoir le même numéro de version. Les versions antérieures à la 1.0pre4 ne sont pas prévues pour jouer en réseau. Le jeu en réseau entre deux versions différentes du programme acceptera de démarrer, mais sera susceptible de crasher à tout moment.
- .P
---- a/doc/man/it/tornado.6.it.in
-+++ b/doc/man/it/tornado.6.it.in
-@@ -74,13 +74,13 @@
- .SH FILE
- PREFIX/bin/tornado
- .P
--PREFIX/man/man6/tornado.6
-+/usr/share/man/man6/tornado.6
- .P
- /var/games/tornado.scores
- .P
--/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
-+/usr/share/locale/de/LC_MESSAGES/tornado.mo
- .P
--/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
-+/usr/share/locale/fr/LC_MESSAGES/tornado.mo
- .SH NOTE
- Avviando il gioco in modalità network, dovreste avere la stessa versione del gioco dal lato server e client. Le versioni precedenti alla 1.0pre4 non funzioneranno per nulla, a causa della mancanza delle funzionalità di rete. Con versioni diverse ai due lati, il gioco si avvierà ugualmente, ma potrebbe andare in crash ad ogni momento, se c'é troppa differenza tra le due versioni.
- .P
---- a/doc/man/nl/tornado.6.nl.in
-+++ b/doc/man/nl/tornado.6.nl.in
-@@ -71,15 +71,15 @@
- .B \-\-version,
- Toont de het versienummer en beeindigt.
- .SH "FILES"
--/usr/local/bin/tornado
-+/usr/bin/tornado
- .P
--/usr/local/man/man6/tornado.6
-+/usr/man/man6/tornado.6
- .P
- /var/games/tornado.scores
- .P
--/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
-+/usr/share/locale/de/LC_MESSAGES/tornado.mo
- .P
--/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
-+/usr/share/locale/fr/LC_MESSAGES/tornado.mo
- .SH "NOTES"
- Als u het spel in netwerk modus draait moeten de client en de server dezelfde versie draaien. Versies voor 1.0pre4 werken helemaal niet,
- omdat die geen netwerk functionaliteit hebben. Het spel zal wel starten met verschillende versies, mar het zal waarschijnlijk later crashen, als er te veel verschillen zijn.
---- a/doc/man/no/tornado.6.no.in
-+++ b/doc/man/no/tornado.6.no.in
-@@ -86,13 +86,13 @@
- .SH FILES
- PREFIX/bin/tornado
- .P
--PREFIX/man/man6/tornado.6
-+/usr/share/man/man6/tornado.6
- .P
- /var/games/tornado.scores
- .P
--/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
-+/usr/share/locale/de/LC_MESSAGES/tornado.mo
- .P
--/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
-+/usr/share/locale/fr/LC_MESSAGES/tornado.mo
- .SH NOTES
- Når du starter spillet i nettverksmodus bør du ha samme versjon på klient
- og tjener. Versjoner før 1.0pre4 vil ikke virke i det heletatt på grunn
---- a/doc/man/ru/tornado.6.ru.in
-+++ b/doc/man/ru/tornado.6.ru.in
-@@ -92,7 +92,7 @@
- .SH æáêìù
- .nf
- PREFIX/bin/tornado
--PREFIX/man/man6/tornado.6
-+/usr/share/man/man6/tornado.6
- /var/games/tornado.scores
- .fi
- .SH ðòéíåþáîéå
---- a/doc/man/tornado.6.in
-+++ b/doc/man/tornado.6.in
-@@ -88,13 +88,13 @@
- .SH FILES
- PREFIX/bin/tornado
- .P
--PREFIX/man/man6/tornado.6
-+/usr/share/man/man6/tornado.6
- .P
- /var/games/tornado.scores
- .P
--/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
-+/usr/share/locale/de/LC_MESSAGES/tornado.mo
- .P
--/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
-+/usr/share/locale/fr/LC_MESSAGES/tornado.mo
- .SH NOTES
- When you run the game in network mode you should have the same game versions
- on client and server side. Versions prior 1.0pre4 won't work at all due to
diff --git a/games-strategy/tornado/tornado-1.4-r2.ebuild b/games-strategy/tornado/tornado-1.4-r2.ebuild
deleted file mode 100644
index 06cbc3b53969..000000000000
--- a/games-strategy/tornado/tornado-1.4-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Clone of a C64 game -  destroy the opponent's house"
-HOMEPAGE="https://github.com/kouya/tornado"
-SRC_URI="https://github.com/kouya/tornado/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PF}-gentoo.patch
-)
-
-src_configure() {
-	if ! use nls; then
-		sed -i \
-			-e '/^all:/s|locales||g' \
-			-e '/^install:/s|install-locale-data||g' \
-			Makefile || die
-	fi
-
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	default
-	fperms 664 "/var/games/tornado.scores"
-}
diff --git a/games-strategy/tornado/tornado-1.4-r3.ebuild b/games-strategy/tornado/tornado-1.4-r3.ebuild
new file mode 100644
index 000000000000..290d8ba78256
--- /dev/null
+++ b/games-strategy/tornado/tornado-1.4-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit plocale toolchain-funcs
+
+DESCRIPTION="Clone of a C64 game - destroy the opponent's house"
+HOMEPAGE="https://github.com/kouya/tornado"
+SRC_URI="https://github.com/kouya/tornado/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	sys-libs/ncurses:=
+	virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "/SCOREFILE_NAME/s|/|${EPREFIX}/|" scores.h || die
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+
+	emake PREFIX="${EPREFIX}/usr" LOCALEPATH="${EPREFIX}/usr/share/locale"
+}
+
+src_install() {
+	dobin tornado
+	doman doc/man/tornado.6
+
+	einstalldocs
+
+	tornado_man() {
+		doman -i18n=${1} doc/man/${1}/${PN}.6
+	}
+	local PLOCALES="de fr it nl no ru"
+	plocale_for_each_locale tornado_man
+
+	tornado_loc() {
+		insinto /usr/share/locale/${1}/LC_MESSAGES
+		newins po/${1}.mo ${PN}.mo
+	}
+	PLOCALES+=" es pt"
+	plocale_for_each_locale tornado_loc
+
+	insinto /var/games
+	doins ${PN}.scores
+
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.scores
+}