gentoo resync : 19.07.2019

7 files changed, 24 insertions, 14 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index a8c4a31865d7..4a44b807a270 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
index b73b13ef9377..f0932fb823ff 100644
--- a/games-puzzle/galaxis/Manifest
+++ b/games-puzzle/galaxis/Manifest
@@ -1,4 +1,4 @@
 AUX galaxis-1.8-gentoo.patch 1412 BLAKE2B be1f33db0ddd13a5db8dc4f7c5e7c7bd7e1311d8d9eba60b60a816bd9c7f79b7b123d8898d6ec74f696234744cea14424ed8158da02bb0810833f8450c249ea0 SHA512 110c500bdd46e7ea5fdd90bf93468e7560f9de7735b2f7b89f74ddd273d5d9afc1983891106103632429b73f3af16c667d7133987218ca7c5a7f5cceb1106301
 DIST galaxis-1.8.tar.gz 8962 BLAKE2B 3380d44ca6b168ddc71edf4e7fb61bc9a22c24cf73e1bbd4b60a87517a769f3b3b2475d64281168fe6ade7b88bbc75b3eec923cf1d26532b097d6820b14f9817 SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f
-EBUILD galaxis-1.8-r1.ebuild 531 BLAKE2B 6fd0836871c4b21c54392fe80970695beafd8dcaa4f14ba71d382c3c1048cf54b1d28fe3dbf03e038f35730b440c0ca601cc84500c5bfddee675cc740efc356b SHA512 24c6ddf649ace9a4ff56297a6f91c05e1eb03a6ec268aaae3c0c0b1c14887744b3ae60b478517854a2055319b374e5494fc45d6ecc0ea844ce8467e252882537
+EBUILD galaxis-1.8-r1.ebuild 687 BLAKE2B dea7025d503c3ca438035d098c027d82b94e50ffcdcf049dc284318adfdf27a47574add1d87c27e95010aad5d84d874b09edfaf718fcc2f4ea1e83b63b4662a0 SHA512 fa12e3a8a2f7f4c1a91875b51c1db52970097e8646fdadfdfcafdbe1d0080276172974c812913f0a6f45fc7f41f206ca06269e94d9a50c1acb3a9d774855443a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/galaxis/galaxis-1.8-r1.ebuild b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
index 73020c4a91e1..d646f5a94a2b 100644
--- a/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
+++ b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis"
 HOMEPAGE="http://www.catb.org/~esr/galaxis/"
@@ -14,9 +16,15 @@ IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.3:0="
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
+src_compile() {
+	local PKGCONFIG="$(tc-getPKG_CONFIG)"
+	emake TERMLIB="$(${PKGCONFIG} --libs ncurses)"
+}
+
 src_install() {
 	dobin galaxis
 	doman galaxis.6
diff --git a/games-puzzle/tint/Manifest b/games-puzzle/tint/Manifest
index 28edb3d62d99..ea81d5b35788 100644
--- a/games-puzzle/tint/Manifest
+++ b/games-puzzle/tint/Manifest
@@ -1,4 +1,4 @@
 AUX tint-0.03b-ovflfix.patch 1021 BLAKE2B e6188aff5847d05e6fa3909317d2dc054433ccd5a9dcd89a76f8e990efa182405b93ac8b06b81e58f9b12ae56a0981fedbd4c28659c6a87418b40392fcd636bc SHA512 da4d5871b46c57ee5e37f0a4b6e779c33bf7b5c45dcba281b84ccad308195d9b2498489ee22f105e6eef00274cf60757855ab9aa91a146f19159713971b828bf
 DIST tint_0.03b.tar.gz 16909 BLAKE2B 4d619b0def118f76f5d07b12f1fe6ccbe2688f3275d49c3514af9448cd74e6b199a55976fd4340dd8122f101f84a5a7be1c5e9fce6727850ed3ee4c684ec8118 SHA512 f442122248987a4f2843e0abe3ed4b3fcecbb6024aad2b486087468c84d80f94310dcf4a37a3d93a647d0abe9aaf10e7d957c88ec6314c25a9fd90d4dfc16ec1
-EBUILD tint-0.03b-r1.ebuild 759 BLAKE2B 71eb5ae49e191cdeba17d06f2a80f18496d1fd2c4fe7ab0e2861d2f1edf4658d0e195fb082d2344ee0b24a96b495ec4e882ddde6ff87978c3c3a5686b9e4134b SHA512 b78af49089beab3aba6cd2aeaea5fa178fb24db73c53188961eabb3e9cb1ef264f8aa0ce8927109ada319699f59e0ab89c92e92dc63b104295737dfd469cb7cf
+EBUILD tint-0.03b-r1.ebuild 892 BLAKE2B 73d58f78d133b711b013b08317de80ab97c5a525a8e9f3195ce9665ba14f29fee0feec7832a62cddf3947c5a8f40acb540249052629e90a8050a1a1577c1da81 SHA512 5f704b4d6be304b5d190dda06bfc5d8bb3dfd4f7876aa5e4b85090d1c52f420b007e86ecf7917f812f2de543a7e06d1fbadcbccb9c6ee5686e78ebddddb400f9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tint/tint-0.03b-r1.ebuild b/games-puzzle/tint/tint-0.03b-r1.ebuild
index 4b2d9dc72843..bd16b91c4bbf 100644
--- a/games-puzzle/tint/tint-0.03b-r1.ebuild
+++ b/games-puzzle/tint/tint-0.03b-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_P="${P/-/_}"
 DESCRIPTION="Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game"
@@ -15,14 +17,17 @@ IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.4-r1:0="
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch )
 
 src_compile() {
+	local PKGCONFIG="$(tc-getPKG_CONFIG)"
 	emake \
 		STRIP=true \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="$(${PKGCONFIG} --libs ncurses)" \
 		localstatedir="/var/lib"
 }
 
diff --git a/games-puzzle/triptych/Manifest b/games-puzzle/triptych/Manifest
index 18a53864776b..e46821176769 100644
--- a/games-puzzle/triptych/Manifest
+++ b/games-puzzle/triptych/Manifest
@@ -1,3 +1,3 @@
 DIST triptych.tar.gz 1748316 BLAKE2B 0d66265df27f61ddee1e1777a1e749d3a8bbcebf0e2bfe64a054febb48def865b68ab59d9c25804ed725bb11d24af2bbd712cc2de88a7259db26aa6d7c3c8d1f SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa
-EBUILD triptych-1.16.ebuild 1294 BLAKE2B 6125e2c24fe8a02c6eec1b40e9cf47a240e56c4b3cc57a55a4662bd8a490149db24f2f1cfbe4fef79ca31ffb99a437422af87ff8e52faf2e411f319b8918187b SHA512 9d5bae71e7550254ede4d05d1d6bee2ba17e7126b4b7c87d9a6f5a0a4db517b01c8cfff7ce5fa117a9f28fd583f8f07b0d9d744d01027cee914e2fba158fec7e
+EBUILD triptych-1.16.ebuild 1267 BLAKE2B d17858e1c5f1a0961f03e438dcc8a1e2d11e2fd87128c8f7b36c5f78687c15860e9e71d39822ff43ced9987d033a14138bc9f9a85c9307618e25da71f9cdaf72 SHA512 1a4d980dc77ecc6a1e8759e9fefe41ad8eb30d69ded1bf075832fa616615559f15c5b7ea9ca2abe92a5516d81241f0c3fe3be4e5d27637226345dd971683f77e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/triptych/triptych-1.16.ebuild b/games-puzzle/triptych/triptych-1.16.ebuild
index e2257e17ad3f..3e69e845e765 100644
--- a/games-puzzle/triptych/triptych-1.16.ebuild
+++ b/games-puzzle/triptych/triptych-1.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils user
+inherit desktop eutils
 
 DESCRIPTION="Fast-paced Tetris-like puzzler"
 HOMEPAGE="http://www.chroniclogic.com/triptych.htm"
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="bindist mirror strip"
 
-RDEPEND=">=media-libs/libsdl-1.2[abi_x86_32,opengl,sound,video]
+RDEPEND="acct-group/gamestat
+	>=media-libs/libsdl-1.2[abi_x86_32,opengl,sound,video]
 	virtual/opengl[abi_x86_32]
 	x11-libs/libX11[abi_x86_32]
 	x11-libs/libXext[abi_x86_32]"
@@ -26,10 +27,6 @@ S="${WORKDIR}/${PN}"
 DIR="/opt/${PN}"
 WRITABLE=( "${EROOT}${DIR}"/{hwconfig.cfg,${PN}.{clr,cnt,scr}} )
 
-pkg_setup() {
-	enewgroup gamestat 36
-}
-
 src_prepare() {
 	default
 	rm -v *.dll || die