gentoo resync : 21.07.2018

5 files changed, 433 insertions, 66 deletions

diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest
index 830934926e91..f4205c372155 100644
--- a/games-strategy/tornado/Manifest
+++ b/games-strategy/tornado/Manifest
@@ -1,4 +1,4 @@
-AUX tornado-1.4-gentoo.patch 955 BLAKE2B 923f1f8aff22a9ac20e67220c249e57fd80a028ab8f2f58106c1c7300a29cd97e2bf52cb6403150f645a8a91f565b2a853631d656ddf80d909bfc35dd508537b SHA512 16499538f588370026e05518d5f437599b9f1a291e47c681cb8f7c3c7a88ba4dd1aafb8b979bc8fc35640777be8b54bf209433c88ac9f1c667f97a39500973d9
-DIST tornado-1.4.tar.gz 54591 BLAKE2B 6a734730e987c6e0516f08e6b3a594b46285e86f3e9b967bd6ff575dc3a55c053b9e4bb7795b51914eebed87979e2a1a290a0273f68a045630b6255cc9714794 SHA512 764c18b228a24cdcaf1456af79d1bdb997f200c09bc33d8f54df28f1f995db1b1a3a328550c5561bc8ebd38d4187f472aa1c892d91889e613b9ff42b86bee322
-EBUILD tornado-1.4.ebuild 867 BLAKE2B e846e4a5ee6325cf8a175f5864bd2cc128195e101fcb87252c9f9913775e812ae56578b2f18c5311f29d33420df3e3f1b46922af176efe4c06902ba815040c37 SHA512 e260752c861452a53624b62579efdd8246c2f104a404f3197844f9c233218ac867b530b2082e145dc5a86d2d39c9abd33519fa102d5fa26a54dd8d2340a8d82b
+AUX tornado-1.4-r2-gentoo.patch 13288 BLAKE2B 35b3eb05fd6894ec5733e42b2423f19f3ef4ff2e71b90f6f71380fdaec0ad862caafd15a8fb7f0785927f8fee0fdead741dc4bfb34343b510fd330ac649f893e SHA512 683a5dcac5fc12b065ebb4dfc5c9972a6fe6c87ee645cdbdf038313068ae43cc1e022ad8772c6f509f7bc102862bda6cc34ce5ccf132fc06f7d1cabd2d93817a
+DIST tornado-1.4.tar.gz 56341 BLAKE2B 81b99ab6484c5267c90792cfefb9dad638d8057224e4eb755dde85638e17bfb5cc17fe64bf84b0d631905493e8e1e276f0842b4f9bbe2eb40e740931a8f422a8 SHA512 32a9e078c0d0498befff78f5cafaa1e45ee2ad45d661f7d89e9038f8ca44c34b27ca846e3e4d68a15f203da20b5f6aeb41826c00159d66d9640f3b2bdd6b6e12
+EBUILD tornado-1.4-r2.ebuild 740 BLAKE2B f762b2cac420201ed1df9e77c58e19c79d9f9c113e0159f77a7d9b03c61f120ea856e7561994fe0e64db582161abed2a6288789053adb32d716e9007c1380640 SHA512 463357f175bd3707fd95f8274f248b71fd1df335bfc24e3aed9b2162a753edce7c82e23d46d9fc8e2d40f08edb93babe5a88e97f95b7ddbafef568818dda7c20
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/tornado/files/tornado-1.4-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-gentoo.patch
deleted file mode 100644
index fb8966841158..000000000000
--- a/games-strategy/tornado/files/tornado-1.4-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.old        2009-02-12 12:42:25.000000000 +0100
-+++ Makefile    2009-02-12 12:44:52.000000000 +0100
-@@ -1,10 +1,9 @@
--CC = gcc
- MAKE = make
--LDFLAGS = -lncurses
-+LDLIBS = -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)\""
-+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) $(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)\""
diff --git a/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
new file mode 100644
index 000000000000..72951781f3e2
--- /dev/null
+++ b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
@@ -0,0 +1,388 @@
+--- 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
new file mode 100644
index 000000000000..c2a5f7c2f76c
--- /dev/null
+++ b/games-strategy/tornado/tornado-1.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="
+	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.ebuild b/games-strategy/tornado/tornado-1.4.ebuild
deleted file mode 100644
index 0c6638176e97..000000000000
--- a/games-strategy/tornado/tornado-1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Clone of a C64 game -  destroy the opponent's house"
-HOMEPAGE="http://kiza.kcore.de/software/tornado/"
-SRC_URI="http://kiza.kcore.de/software/tornado/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "s:PREFIX/bin:${GAMES_BINDIR}:" \
-		-e "s:PREFIX/man:/usr/man:" \
-		-e "s:/var/games:${GAMES_STATEDIR}:" \
-		-e "s:/usr/local:/usr:" \
-		doc/man/tornado.6.in \
-		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
-	dogamesbin tornado
-	doman doc/man/tornado.6
-	dodoc AUTHOR CREDITS Changelog README TODO
-	insinto "${GAMES_STATEDIR}"
-	doins tornado.scores
-	prepgamesdirs
-	fperms 664 "${GAMES_STATEDIR}/tornado.scores"
-}