gentoo resync : 02.05.2018

5 files changed, 18 insertions, 73 deletions

diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
index 77a9c48f7471..11ee45776453 100644
--- a/games-puzzle/einstein/Manifest
+++ b/games-puzzle/einstein/Manifest
@@ -1,7 +1,5 @@
-AUX einstein-2.0-64bit.patch 990 BLAKE2B 326faa3086f700751adffdb77d3fc36c1bf19d2ead4c89d3b77966f1c61a768791f58676dfef752e811b0bf1455d95e604403221bc014282bde97505777d9784 SHA512 36115b1519edfd1e666f14ca3c98b50ea963bec35a2b75a77c3923debf40f3aced1b8d5b2bccf079fd8cdbf45df7ec9619a5eb6f4caaafcad293e9b90aef270b
-AUX einstein-2.0-as-needed.patch 310 BLAKE2B 8819ca86ac76155b4a15920318b1b3d0718665c1bf347720f8ebe594cc4ef92d05696e797f5dc5afe806876a0d4423fee3effb20f4150df8a59c4f27cfac1ec5 SHA512 b535f4dae3fd20728805b3ddbf45f7b9bd29ab82047455bdccc7a1714d75dafd7608a6488ff3a41d5effd9c92ca26a8c74c767b3cc2b835130d8a1e411a26f09
-AUX einstein-2.0-gcc43.patch 391 BLAKE2B 155966d1dcd412dd56903d15f9fd10569abb4cd1c518f04a43cdc28973992b15cd725d59807cd1f826743c28bd0a17d8f4ba486a3daa2bd2b987ad2ffee0e857 SHA512 40900fc551f794b58bd3458a5289c2adfbf439a6bfcb477ce777531545e69056747e856dbe24a181c7748e583fadab14ab622e5d044a0836115dd9ee15a40e98
-DIST einstein-2.0-src.tar.gz 722301 BLAKE2B 3cb857bbbbfe9d3dab763d461dfe0c91ed204ac2e080a6d546e35cb869da05a8735900bd1db071074628b11f77e675bc21a811a79079587c6388b58ba401dcd1 SHA512 45599546f2f7fce32f7441cfdae88b72297f4a506d9eb98a64c3b24ec2e2fd86a63d59961a21e017df6a7a676d864ad12598d735f9049adf43cddd91d661f619
+AUX einstein-2.0-as-needed.patch 314 BLAKE2B a76c5d93cf391eed152c151618c47db2029f70fa711dca0b816de9d6c282cb3da9f3455e99ddf0ba308db14daca1f228eef32ab76c26b5d53b300acb5ba0afc8 SHA512 4943199a89fb19025618c1a95afc4e57f740259992997460292af1cbdd764d668538c5acca2e1077bdfb78936c66b3a88e698194167ad72b3ee8e42501070dd3
+DIST einstein-2.1.1.tar.gz 1317979 BLAKE2B 7924774c2d540ecd7cbecb344907d20ab9514219407a02852bbd80bbb9d1d27bac14654a1553dbe30e8f0fd79e08f12338a4e43dfc3c06bfb433fb3a46330a64 SHA512 e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3
 DIST einstein.png 932 BLAKE2B 13ecf24e5600bf39bbaec662afda5b4fdba2c5adf4560e8f08996b2e6c475002857187be2dac2d2c898cdb63854cc7ea1748b6b1d34a67adcc2f4789aafd5c25 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283
-EBUILD einstein-2.0.ebuild 1035 BLAKE2B ce339be8aa005c0c626eb2c36705e6625aa89c5464f1767f6fa5cb7b79e0bc3c6a4aea0e025d0ad1ca309120dbeaef4a5733115fd3b06ad254406db7ccf7f105 SHA512 d8ee94e45def134377571f16a55aa4cac09b4ad4f9fd72cbf9892817d62f8700f911371c7b87d471d35594e9a4f7af7110df3dcdfdcaa3c15cb30d4f9485fdac
+EBUILD einstein-2.1.1.ebuild 909 BLAKE2B d01a1d5614203f3da997ce819cab6a1660187c615ea4f987ebb55a797348fba072ae57e06b8853fb6fe27d253e38038b88439cb94c5bad6a504c79cf0d0b9d65 SHA512 cf7c474f025a4e0d9a8eef09d5e50047ece42e9c33682a9c84453ee0aff03753be660d310d8abbb71e15854e5f54906b55cfeea04a8a0f70da097eb323ad536a
 MISC metadata.xml 334 BLAKE2B bd52f381c3b7a79dfad6318f086d3ac04f1e52e0707dc4556a886dcd37416f191a36d4e47e22b67b7539d99b00159f179a12b12faeafe2c2c1ca7b42c4226255 SHA512 defe221da415005e05b0b8d58edd84050a565b3249bfd0eae9875f92a67ee0faf320f86cd2b6f703add270f86edfc187e8597fb659b4499e092825b82cd91f64
diff --git a/games-puzzle/einstein/einstein-2.0.ebuild b/games-puzzle/einstein/einstein-2.1.1.ebuild
index a689cf7dc9f5..857e57a6e54a 100644
--- a/games-puzzle/einstein/einstein-2.0.ebuild
+++ b/games-puzzle/einstein/einstein-2.1.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="A puzzle game inspired by Albert Einstein"
-HOMEPAGE="https://freecode.com/projects/einsteinpuzzle"
-SRC_URI="mirror://gentoo/${P}-src.tar.gz
+HOMEPAGE="https://github.com/lksj/einstein-puzzle"
+SRC_URI="https://github.com/lksj/einstein-puzzle/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	mirror://gentoo/${PN}.png"
 
 LICENSE="GPL-2"
@@ -19,24 +19,22 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-ttf"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${PN}-puzzle-${PV}"
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}*.patch
+	default
+	eapply "${FILESDIR}"/${PN}-2.0-as-needed.patch
 	sed -i \
-		-e "/PREFIX/s:/usr/local:${GAMES_PREFIX}:" \
-		-e "s:\$(PREFIX)/share/einstein:${GAMES_DATADIR}/${PN}:" \
-		-e "s:\$(PREFIX)/bin:${GAMES_BINDIR}:" \
+		-e "/PREFIX/s:/usr/local:/usr:" \
 		-e "s/\(OPTIMIZE=[^#]*\)/\0 ${CXXFLAGS}/" Makefile \
 		|| die
-	sed -i \
-		-e "s:PREFIX L\"/share/einstein:L\"${GAMES_DATADIR}/${PN}:" main.cpp \
-		|| die
 }
 
 src_install() {
-	dogamesbin "${PN}"
-	insinto "${GAMES_DATADIR}/${PN}/res"
+	dobin "${PN}"
+	insinto "/usr/share/${PN}/res"
 	doins einstein.res
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "Einstein Puzzle"
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-puzzle/einstein/files/einstein-2.0-64bit.patch b/games-puzzle/einstein/files/einstein-2.0-64bit.patch
deleted file mode 100644
index 4d6656252898..000000000000
--- a/games-puzzle/einstein/files/einstein-2.0-64bit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- einstein-2.0.orig/formatter.cpp
-+++ einstein-2.0/formatter.cpp
-@@ -58,7 +58,7 @@
-             if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
-                     (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
-             {
--                int no = (int)c.data;
-+                long int no = (long int)c.data;
-                 args[no - 1] = c.type;
-             }
-         }
-@@ -123,7 +123,7 @@
- std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
- {
-     std::wstring s;
--    int no;
-+    long int no;
- 
-     for (int i = 0; i < commandsCnt; i++) {
-         Command *cmd = &commands[i];
-@@ -135,8 +135,8 @@
-                 
-             case STRING_ARG:
-             case INT_ARG:
--                no = (int)cmd->data - 1;
--                if (no < (int)argValues.size())
-+                no = (long int)cmd->data - 1;
-+                if (no < (long int)argValues.size())
-                     s += argValues[no]->format(cmd);
-                 break;
- 
diff --git a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
index fe870bf036e7..3edb666ad690 100644
--- a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
+++ b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
@@ -1,5 +1,5 @@
---- Makefile.old        2009-02-09 16:37:58.000000000 +0100
-+++ Makefile    2009-02-09 16:38:13.000000000 +0100
+--- a/Makefile.old        2009-02-09 16:37:58.000000000 +0100
++++ b/Makefile    2009-02-09 16:38:13.000000000 +0100
 @@ -49,7 +49,7 @@
  
  
diff --git a/games-puzzle/einstein/files/einstein-2.0-gcc43.patch b/games-puzzle/einstein/files/einstein-2.0-gcc43.patch
deleted file mode 100644
index 25e1815e5e41..000000000000
--- a/games-puzzle/einstein/files/einstein-2.0-gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- einstein-2.0.orig/convert.h
-+++ einstein-2.0/convert.h
-@@ -5,6 +5,7 @@
- #include <iostream>
- #include <sstream>
- #include <string>
-+#include <typeinfo>
- 
- #include "exceptions.h"
- #include "unicode.h"
-
---- einstein-2.0.orig/unicode.cpp
-+++ einstein-2.0/unicode.cpp
-@@ -1,5 +1,6 @@
- #include <wchar.h>
- #include <stdlib.h>
-+#include <string.h>
- #ifdef WIN32
- #include <windows.h>
- #endif