gentoo resync : 28.04.2019

7 files changed, 19 insertions, 15 deletions

diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 1a565e72e183..6935b1022487 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/tuxmath/Manifest b/games-kids/tuxmath/Manifest
index b6aade9e1937..e97dfb6fc7bb 100644
--- a/games-kids/tuxmath/Manifest
+++ b/games-kids/tuxmath/Manifest
@@ -1,3 +1,3 @@
 DIST tuxmath_2.0.3.orig.tar.gz 10396696 BLAKE2B bd060178e1acf62a36da380b9212e72549fde8f6e680d6ca3a4bbee3a0db163ae96a2df2a26d03bad96bf9fc297a6de5c6b0135b4be98ebacc325e1aff5ffbdf SHA512 dd7af90f3b1bd637f2f1639a3877d1a9950c95e60b1a71633998e2b0a654bb8015c4bf83540a9af092fe054d468035d0de5f3ddc7d54b17c3235f794a6108fbe
-EBUILD tuxmath-2.0.3-r1.ebuild 1267 BLAKE2B f3019ba58a18dc8b719a671e41049b1248bcb95d829ef5c223515429675a6b8993f99a496d491c230541bceb17657c461a4f791111865c19bdb40a7ec225242a SHA512 e3da9218c8faf5659eb31c4d5886e8bf9d82e677d8d1977a51fa11b058dd67a8b7bab7c01ee361be5975f1c61d2a92a3e9e7f6f6327cdb649c3f410cdde197e7
-MISC metadata.xml 330 BLAKE2B 9bce1114f26de1cdca452e5fe280ecda8bd5ed968cf7cfd15338252d748c91ecbf7cde6270e84ff9bee4e7904bd3ab6aa874fcc40d3e748828936eae5a162376 SHA512 6119196d06b8bdee2062eda1fcca6735e17325bbc19991a1c021c864f6d962e44eda75fc016b2995056c452431659b7d1e158723d115ae58e699bbeb50e5fa1b
+EBUILD tuxmath-2.0.3-r1.ebuild 1257 BLAKE2B 7a86a39eca2d9b280cc981db21f19c4e66a20e0c14ccb7097a2121c0553897425cdbda296c90a894f86f0408a8ec68a4ba4601c129ffafff59ff8cb70c0031c3 SHA512 659371a77325e474b14ff5cb59ac7f257b89d7d065c438efd1057699d24139ce2435b226e9021d8015767641da2901665ee4b6668f0400e34fdc0de8ec554a85
+MISC metadata.xml 386 BLAKE2B 7dfebc426afb7fa3073cdcb11c90ed3a2f42cb40dab13e50fa66bcb40b77beab71a2cae73cd3311ba37fa898b905674e9f868f56eb1ee9232ea4bfa5db7dcadc SHA512 7964e4fb65b8dedcbeee8612a9131775db05dd111838b1b07864adf739c228aa9f2df43a26ad6fe46c27a71ab3c2bfeb3540e9e6b7627968eae94f69d946ac76
diff --git a/games-kids/tuxmath/metadata.xml b/games-kids/tuxmath/metadata.xml
index b916dfd60180..c1f02a416248 100644
--- a/games-kids/tuxmath/metadata.xml
+++ b/games-kids/tuxmath/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tuxmath</remote-id>
+		<remote-id type="github">tux4kids/tuxmath</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild b/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
index 56c09b87901e..2ef1bded85da 100644
--- a/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
+++ b/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit eutils gnome2-utils
 
 MY_PN="${PN}_w_fonts"
 DESCRIPTION="Educational arcade game where you have to solve maths problems"
-HOMEPAGE="http://tux4kids.alioth.debian.org/tuxmath/"
+HOMEPAGE="https://github.com/tux4kids/tuxmath"
 SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2 OFL-1.1"
diff --git a/games-kids/tuxtype/Manifest b/games-kids/tuxtype/Manifest
index ef8524e2ece4..95f00424ad5a 100644
--- a/games-kids/tuxtype/Manifest
+++ b/games-kids/tuxtype/Manifest
@@ -1,3 +1,3 @@
-DIST tuxtype_w_fonts-1.8.1.tar.gz 11528002 BLAKE2B 45cf547f94665913746c6f3fbcd25554cd4adeda1b6cbcc7cbffc1afec3c161f590ad9d21fa53c8e141978916a2d943cfa626cf412f805aeaf7d327284b11615 SHA512 2c360807295f8d9f3d18f36b64c49e39fac78d81570c7a554244a01ee76627c90579e580b609ea7994378f5bbff916142e293ad94306b7b38d132fdc1c53734f
-EBUILD tuxtype-1.8.1-r1.ebuild 1059 BLAKE2B 5ae170cdbcad66fa1a2e2710555a0ab453b3de73058658700c3722041e7fc469de8498ed2bf78c9762308efca637279c626c527a0a3d07202bdd022d5b18f85c SHA512 0022ad58f51ed9eb84968c6b690c73b4cce22e61a72ef9a458fc79fe9c31474f6987af156957722d7f7fc37d9df0f277100cd4511bc91ef0278452b890a875e8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+DIST tuxtype-1.8.1.tar.gz 11470321 BLAKE2B 13650d319e75ed9770113475841780c3413b1d9918f9641bb5b32cf67a622ab731c54149e52252f69030ab8e016b4de408a835aaed29cbf5772213b58cab3e65 SHA512 c7285ece93168260215e20cb5e4f4a46da00687c22241e70f97f735e19501ea8f1abb38e4070fac108c524e5aa3f23f680acef6ef9f5654bc2dab954bcadab01
+EBUILD tuxtype-1.8.1-r1.ebuild 1049 BLAKE2B ce252f49310e8108dad0670ff5172b22fc131938f3245a633f182d0a311ba4bb57c693f9bfa79f6d37cea836896e494e195adaaac67ee1871d8ffbde3d772ebd SHA512 db9d4756211046fa25c82e8711dd62c5e43f255d4db2025ffb98d0e7776140bbe06f4b411ba45fc9ee16fa698fb96a4b1d0568a08459cca61edf49db23850fa2
+MISC metadata.xml 334 BLAKE2B 6f4e62b0dbebab5c82703fda8a4aa7c796d282025d649e14416516e8ab94708342795dd9a9c70d6dd62590eda3822c51068dc4592691f8034eeaf1333451ff95 SHA512 12a1bc978d61fb759e63526aa05eea9efe60d269d0a2d52a37c4c72be7ddb0aa1e1eb0a9d76b2f0b1e91772ab50ed1a72dc9c0e486705fc51d79aed6fb786c69
diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml
index 78274e0fa550..52de2ed0b372 100644
--- a/games-kids/tuxtype/metadata.xml
+++ b/games-kids/tuxtype/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tux4kids/tuxtype</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
index ecb8f47f7717..428594088496 100644
--- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils user
 
 DESCRIPTION="Typing tutorial with lots of eye-candy"
-HOMEPAGE="https://alioth.debian.org/projects/tux4kids"
-SRC_URI="https://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-${PV}.tar.gz"
+HOMEPAGE="https://github.com/tux4kids/tuxtype"
+SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 OFL-1.1"
 SLOT="0"
@@ -21,7 +21,7 @@ DEPEND="media-libs/libsdl[video]
 	svg? ( gnome-base/librsvg )"
 RDEPEND=${DEPEND}
 
-S=${WORKDIR}/tuxtype_w_fonts-${PV}
+S=${WORKDIR}/${PN}-upstream-${PV}
 
 pkg_setup(){
 	enewgroup gamestat 36