gentoo resync : 15.12.2019

6 files changed, 24 insertions, 168 deletions

diff --git a/games-simulation/micropolis/Manifest b/games-simulation/micropolis/Manifest
index 69abe921bf99..8603f8183449 100644
--- a/games-simulation/micropolis/Manifest
+++ b/games-simulation/micropolis/Manifest
@@ -1,7 +1,3 @@
-AUX micropolis-glibc-2.27.patch 1272 BLAKE2B b52066535bda38be3f74d1f6c8a0a351f1254befd272dcb828b171e5733431f15818160dfc267035281820625395d18e202e3019e868e08559d3cd282b9cb3af SHA512 05de6891a41d55794d095d1c09408db7a5f1a87bd673005704a7e8727ba601eb9f4555a5f992a9069a9e7ab6ea5bb0986e5a9da18133722d76f4841c94222c69
-AUX micropolis-remove-matherr.patch 713 BLAKE2B bbf07c301e90adf7ba020e9bc064c4be528ab2551f881cd7d46b661779099742d90081d0b4e9d629b90e8c97894f8f0a4eb0cb932a77fa09801300dc6f01db5e SHA512 b9c433be304e95386975ecdbb88aa0ec7316681786a6ca4c73054f8ddb59252b857b2dfd63a2289b8808a27c78172b819b58ba8a221647b4a746441165babdeb
-DIST micropolis-activity-source.tgz 7676438 BLAKE2B 9415cf2f1980fe5a1f412561c9a53dca86d388f9fb529801af1e6071b3c92bc03daaff84c1ac1f964578d5805a4f2a9f60cfa0c56c0a1032bc0eed686207e538 SHA512 fe65966c43d044e01a63a3cfe3cad48466eb1e5ec8b13c03abb52d582395a8ab527332d4d04454a4f32e85b65e55d72fe5e4d53a3f37b422d90e9208f00d9976
-DIST micropolis_git.patch 83549 BLAKE2B 13cd94f3018ffd23dcbe5c1baf0b948cac7fb9b2f858d42f259003f2697060b156b900fcc8611e560a8b46e0e68fb6ff78d376bfc937cf12b55655067fb13f6d SHA512 9d1801478a27184c48d327094cad8238f7972c2cf3624c7c196375f2dd20c3374575b393d44cb2fb99613e19d66c4cc4fb27ae52df9fddf4e42adb42523bdc17
-EBUILD micropolis-1.0-r1.ebuild 1190 BLAKE2B c5d6f1deb3a01fd50eca19f71f33c176140ab30974a9c5dc328fbab46bd5a6d6a57058a380f443d4639de2e6ea908a1989622a37b4c3d9f76af5f12bd861ac84 SHA512 227c999dffdd95f89123d987d0eaece6672899147db634181e6080399d83fceb2eac6565601e6baa79dacfc0f137b0a3a20a7ee10b1fd5986c87645e573e7574
-EBUILD micropolis-1.0-r2.ebuild 1277 BLAKE2B 58fef1d7fb2868195dddc5cbfbf1d1e34e0857354e26d045ae06e8002fda21dacade267aa75f960fdaa2cd03d5f7398e6894e4a3f44ef08546f55e4c39ce9ba1 SHA512 1b677e2acdc054d2cc360403578ec641dfbc0f4c65d7bca4689d8bc522bc96fc7633ee780ddc3225be7d96fe644f035c507e6a6b666e872c6643c6d835e31ad8
-MISC metadata.xml 318 BLAKE2B 0a772efef1bdef4bff48d961f943d5075316a69f050f31ffae69a30c8f70ad11b31712ce20cd840d9c6aef7f366ccaba0e2b265f5050a5bdc1c56ec240493e9d SHA512 7dde0fe493b040693af161ef449f7d5bce64988568d7fdf5eae0f9c7e8e404386a498da6aaae768e60ebc84bc948e8a65642cbb6ad8f128bd52163722ba129bc
+DIST micropolis-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.tar.bz2 6725746 BLAKE2B a916389a1ccf63e1a13b5b6ea533939fdb14d814480c9e528c8b1bb89cbefbbad9ad067821c1de199f337692e226d35b3219354dc32612486d013cc20f21c5bc SHA512 1b5f644f6d7d7cb78965d0e0edcfcc0bdab7a103dd5dc3ce97a0048da9fa29d8757063d6681febab3d03182433cfe8a7bf1b8145a21e067a4c754af3b5af8e00
+EBUILD micropolis-1.0_p20180313.ebuild 1164 BLAKE2B 6da592d1667e94b188ae223cbac28bbb0cdfe15826894684deba64e03117f9c5c8589ef7668d0b1a4c0067515f6771d08cc27b2e9d1e062eefdf3ce311677d73 SHA512 e5f853940aed8841409ddb0b87e07fd72afac05b80a7f0417db6c0168fb330a013240af06527c91fea890181ee18b1636bb597f2198687a0ce46655649bfda5c
+MISC metadata.xml 412 BLAKE2B 9a862272fd0dfb39e611f7c2aa89a697569b6faaa7ef004f72a58490ef125f7bbd154decc77cce6f389fec7659543b49405674eed377331853bcadf95138dc8d SHA512 2ae5bdc576bb5ba37d5bfb87fd20926e12b66d36947a327e1835af5dced9046acaed250a188b10eebba7f4f1a7c13f82ba7d87fb3bc99a294db89600e427f2a1
diff --git a/games-simulation/micropolis/files/micropolis-glibc-2.27.patch b/games-simulation/micropolis/files/micropolis-glibc-2.27.patch
deleted file mode 100644
index ee4fd33ae875..000000000000
--- a/games-simulation/micropolis/files/micropolis-glibc-2.27.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Tue, 13 Mar 2018 20:25:31 +0100
-Subject: glibc 2.27
-
-Remove SVID error handling to fix FTBFS with glibc 2.27.
-
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/891338
----
- src/tclx/src/tclxfmat.c | 21 +--------------------
- 1 file changed, 1 insertion(+), 20 deletions(-)
-
-diff --git a/src/tclx/src/tclxfmat.c b/src/tclx/src/tclxfmat.c
-index 19d42c3..2146566 100644
---- a/src/tclx/src/tclxfmat.c
-+++ b/src/tclx/src/tclxfmat.c
-@@ -119,27 +119,8 @@ static int
- ReturnFPMathError (interp)
-     Tcl_Interp *interp;
- {
--    char *errorMsg;
- 
--    switch (G_errorType) {
--       case DOMAIN: 
--           errorMsg = "domain";
--           break;
--       case SING:
--           errorMsg = "singularity";
--           break;
--       case OVERFLOW:
--           errorMsg = "overflow";
--           break;
--       case UNDERFLOW:
--           errorMsg = "underflow";
--           break;
--       case TLOSS:
--       case PLOSS:
--           errorMsg = "loss of significance";
--           break;
--    }
--    Tcl_AppendResult (interp, "floating point ", errorMsg, " error",
-+    Tcl_AppendResult (interp, "floating point error",
-                       (char *) NULL);
-     G_gotTclFPMathErr = FALSE;  /* Clear the flag. */
-     return TCL_ERROR;
diff --git a/games-simulation/micropolis/files/micropolis-remove-matherr.patch b/games-simulation/micropolis/files/micropolis-remove-matherr.patch
deleted file mode 100644
index c6bb1a1efc5a..000000000000
--- a/games-simulation/micropolis/files/micropolis-remove-matherr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Tue, 13 Mar 2018 21:42:31 +0100
-Subject: remove matherr
-
-Work around "tclxmerr.c:40:30: error: dereferencing pointer to incomplete type
-'struct exception'"
-
----
- src/tclx/src/tclxmerr.c | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/src/tclx/src/tclxmerr.c b/src/tclx/src/tclxmerr.c
-index dc3596b..06aad3a 100644
---- a/src/tclx/src/tclxmerr.c
-+++ b/src/tclx/src/tclxmerr.c
-@@ -33,15 +33,6 @@
-  *
-  *-----------------------------------------------------------------------------
-  */
--int
--matherr (except)
--    struct exception *except;
--{
--    if (Tcl_MathError (except->name, except->type))
--        return 1;
--    else
--        return 0;
--}
- 
- #else
- 
diff --git a/games-simulation/micropolis/metadata.xml b/games-simulation/micropolis/metadata.xml
index eac64a74f324..4f01ecb15136 100644
--- a/games-simulation/micropolis/metadata.xml
+++ b/games-simulation/micropolis/metadata.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
-<maintainer type="project">
-<email>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">stargo/micropolis</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-simulation/micropolis/micropolis-1.0-r2.ebuild b/games-simulation/micropolis/micropolis-1.0-r2.ebuild
deleted file mode 100644
index abf421c4d035..000000000000
--- a/games-simulation/micropolis/micropolis-1.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-DESCRIPTION="Free version of the well-known city building simulation"
-HOMEPAGE="http://www.donhopkins.com/home/micropolis/"
-SRC_URI="http://www.donhopkins.com/home/micropolis/${PN}-activity-source.tgz
-	http://rmdir.de/~michael/${PN}_git.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-S=${WORKDIR}/${PN}-activity/
-
-PATCHES=(
-	"${DISTDIR}"/${PN}_git.patch
-	"${FILESDIR}/micropolis-glibc-2.27.patch"
-	"${FILESDIR}/micropolis-remove-matherr.patch"
-)
-
-src_unpack() {
-	unpack ${PN}-activity-source.tgz
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s:-O3:${CFLAGS}:" \
-		src/tclx/config.mk src/{sim,tcl,tk}/makefile || die
-	sed -i -e "s:XLDFLAGS=:&${LDFLAGS}:" \
-		src/tclx/config.mk || die
-}
-
-src_compile() {
-	emake -C src LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local dir=/usr/share/${PN}
-
-	exeinto "${dir}/res"
-	doexe src/sim/sim
-	insinto "${dir}"
-	doins -r activity cities images manual res
-
-	make_wrapper micropolis res/sim "${dir}"
-	doicon Micropolis.png
-	make_desktop_entry micropolis "Micropolis" Micropolis
-}
diff --git a/games-simulation/micropolis/micropolis-1.0-r1.ebuild b/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
index b6f6a4e58bd3..c1c8bfccecec 100644
--- a/games-simulation/micropolis/micropolis-1.0-r1.ebuild
+++ b/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
@@ -1,36 +1,28 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
 
+inherit desktop eutils toolchain-funcs
+
+COMMIT="cc31822e4ebe54c0109623ac0c5cdf0e3acad755"
 DESCRIPTION="Free version of the well-known city building simulation"
-HOMEPAGE="http://www.donhopkins.com/home/micropolis/"
-SRC_URI="http://www.donhopkins.com/home/micropolis/${PN}-activity-source.tgz
-	http://rmdir.de/~michael/${PN}_git.patch"
+HOMEPAGE="https://www.donhopkins.com/home/micropolis/"
+SRC_URI="https://gitlab.com/stargo/micropolis/-/archive/${COMMIT}/micropolis-${COMMIT}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libsdl
 	media-libs/sdl-mixer
 	x11-libs/libX11
 	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-S=${WORKDIR}/${PN}-activity/
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison"
 
-PATCHES=(
-	"${DISTDIR}"/${PN}_git.patch
-)
-
-src_unpack() {
-	unpack ${PN}-activity-source.tgz
-}
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_prepare() {
 	default
@@ -42,7 +34,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -C src LDFLAGS="${LDFLAGS}"
+	emake -C src LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {