gentoo resync : 19.07.2019

9 files changed, 19 insertions, 24 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 72253fa6654e..79b558d4b57d 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 1dbcd9173829..cce19f071852 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -5,6 +5,6 @@ DIST df_43_05_linux.tar.bz2 11580594 BLAKE2B 7157f8ed5f8798a533d992811c804515acc
 DIST df_43_05_linux32.tar.bz2 12158550 BLAKE2B 4c1f5ad834aa0a2b6438b8aaf0b0ad6cfc60656f58845a274ac3d8ad7e09182d7263e3a495d1bff0b1fb5499097569216fac0bc87cff95fc6a85e3211acc297d SHA512 d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
 DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
 DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
-EBUILD dwarf-fortress-0.43.05.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
-EBUILD dwarf-fortress-0.44.12.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
+EBUILD dwarf-fortress-0.43.05.ebuild 2333 BLAKE2B 3b3f5f22f4a41262247c5e36674dae24cd00e6da5de7bab794ecc754d2102f8758b36d6d2b1c6b33a9d62e1fda3bd5b276036b7f91e12a9763c5df854e5ff999 SHA512 3f0a4273ca6de77beab1d4c1843a23a91f92f2fc8f31be8ed936e76ff8b97a5a6e3a784b8d7aed89aa68534389a0e1f2f86646a4d526a8da08dd3531606c59dd
+EBUILD dwarf-fortress-0.44.12.ebuild 2333 BLAKE2B 3b3f5f22f4a41262247c5e36674dae24cd00e6da5de7bab794ecc754d2102f8758b36d6d2b1c6b33a9d62e1fda3bd5b276036b7f91e12a9763c5df854e5ff999 SHA512 3f0a4273ca6de77beab1d4c1843a23a91f92f2fc8f31be8ed936e76ff8b97a5a6e3a784b8d7aed89aa68534389a0e1f2f86646a4d526a8da08dd3531606c59dd
 MISC metadata.xml 244 BLAKE2B b555c02e321a80c79408860928b5218ead8d9d3f3a9062305b74aeee30f22bef5ff0efaddc7fbfc0ca845c0a71bc0dc7c055d58686b6c335d33c23ff1bdc81e6 SHA512 becc8f40ea3cff7e5b8d752c3c521601207e37cbc5936dcb5e923ac43050009773ed1dc260725e1f1da38f81082c6aeb6e8cf4f3c092b54d9c32b704064e0789
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
index a8f36028ee27..550711946908 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
 
 LICENSE="free-noncomm BSD BitstreamVera"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="media-libs/glew:0
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
index a8f36028ee27..550711946908 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
 
 LICENSE="free-noncomm BSD BitstreamVera"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="media-libs/glew:0
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index d799b8ad9c32..3774a1a24a83 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -2,5 +2,5 @@ AUX moria-5.7.10-gentoo-paths.patch 1823 BLAKE2B 74ae8ba961a1dbd0ee42426d0cbae96
 AUX moria-5.7.10-tinfo.patch 700 BLAKE2B da5668f85f1e83af86332ced8d6f76d2cc16ea20fc8b2c4713fc375222c13a3d1d44ef1aaa88a7206ad831813b257a2ef8b780d8803375ad34a08327a1eea5eb SHA512 89003bf4c7a6a416817a017ca332c7e0a9dea6d4abc849fb61381e5382975c37aa0025cb9301e2a1e2ed4a9c4463bcf64e49c1d48fddf37f4bd71988d76ba0ab
 AUX moria.6 2996 BLAKE2B ee20dc08b849eccf3860736b401a500f50598c340c0098d6cd820eb65ecbe13467b09ef23ab4982204b394ca8e0ef644bfbff4c8dd9df07ff15cb2b635d6af5e SHA512 54d4914f4c9bf364ef8539079d0a3cf91257309a479818e106c5ee41bbf2dab608074988d12529fd726e4cafd5c48baed4793f32a2a254593a928c5b6d1b9bd5
 DIST moria-5.7.10.tar.gz 392842 BLAKE2B 6b1f372d2c5503c708428b119e2c0333d3134eab3bd76ad8453ee062764b41d9dccca31c1512bd9561b5ba48b59dac32a447bb058c26c1cd9595cdc2e06cb9fc SHA512 f81754f03ae36ab5a8737fb0ae18da422b87da8684d00c88c934afa2c0b42e429c23a475751c506b499f809a421d1d3dfcc729e0d64d901b2e6c74e444d0f06f
-EBUILD moria-5.7.10.ebuild 1388 BLAKE2B 6c89193ab51fc3bca7408be652e154be07f65cbf03f076df84f8b05c54dea667bb206e9f54d6dfe83bf44a23c6ac36deda50169efb606f21c18ea184d72290b6 SHA512 d80dce33225454af1a2470b25deabf432f4a35681ac2b7bdb00deb5c571733de9da626f77b240ad529d67106b683c97df10716ce0a0164758ec7bc0073692003
+EBUILD moria-5.7.10.ebuild 1365 BLAKE2B 959973cdf9f60e849123f33148bbeb3d7785c8e7e456383d32e122f9340fc1016f0c26c4803241557080d12b92848fb44f8669883fdad7b0dc9456edf7a77ed5 SHA512 232dc7e5ed97eea1b5694ff73cbe6f575d8dc63d84faadab19590ed706f5dca438e104ef8a0c4ac5e329913b55355073e06c518e3c9707135676a72f62341048
 MISC metadata.xml 342 BLAKE2B f53651879ccf3a26ac770d9746a76f5d59eb4403db9bdd4ae5f222f1a8e26c8a0c1ff86c47f087381d49229c1bc9473c7415072fd716ba0ba57f88c21198e5f2 SHA512 f6c4db0374588d0ba1070fdba2e38d647de66378fccc6a59e96c27cd50b4e2f9071259202cb1b33fe99d57332230dc68d450df2017ee1124f6b505d40f9f9843
diff --git a/games-roguelike/moria/moria-5.7.10.ebuild b/games-roguelike/moria/moria-5.7.10.ebuild
index 999c073daa4f..73142dad7977 100644
--- a/games-roguelike/moria/moria-5.7.10.ebuild
+++ b/games-roguelike/moria/moria-5.7.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_IN_SOURCE_BUILD="yes"
-inherit cmake-utils prefix user
+inherit cmake-utils prefix
 
 DESCRIPTION="The Dungeons of Moria, a single player roguelike game, also known as Umoria"
 HOMEPAGE="https://umoria.org/"
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~m68k ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=sys-libs/ncurses-6.0:0="
+RDEPEND="acct-group/gamestat
+	>=sys-libs/ncurses-6.0:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -26,10 +27,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-tinfo.patch"
 )
 
-pkg_setup(){
-	enewgroup gamestat 36
-}
-
 src_prepare() {
 	cmake-utils_src_prepare
 	sed -i "s/@PF@/${PF}/" src/config.cpp || die
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 4ed52d5df787..825bcf906eb5 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -6,6 +6,6 @@ AUX nethack-3.6.0-x11-color.patch 6828 BLAKE2B 4e8f502b8180e042fed9e829d7bdd3c8a
 AUX nethack-3.6.1-recover.patch 3241 BLAKE2B e3f00fc47dc3751c1df93019ea57afd9346ff5cd463d046c03d4fea8b3ea5ea1e6a1080f8910d85dc28892b45e1f335875877dd1a33ca3321b65e19e8630565d SHA512 9ae09828882296015bf776d272b6874e70052d01a5fe2a8a261472f985fb89c0b4d309192262febb7a6848d401d9c1acb9c8e7ff17f45ce41d2185a09ea7dc82
 DIST nethack-360-src.tgz 4261282 BLAKE2B 7be22b8bdc7b5124418fa904aa3776d77440f67ec18782b878e037b989a18092ed88ca192224c7bc1eaa3cb438823188035c3e6d2aa85d13a7aa1e86c8527d32 SHA512 92370a3c60a4f6861b9c0f1e1320fc23d91cedc1615d0d09e06a0ee3e13c9c8c0cd931389bfd7a25845ed07ef966d19d9e46e77ae07084a941685dc67f49c813
 DIST nethack-361-src.tgz 4640769 BLAKE2B 3793a753e4012df64335e7e7ec60284de206012d5bb5d30a7ccfb458e456818f30dd0b4bfa9c41b1691bd01ee6aec2e44b57327586f0c9d76a573bf4c9bb00b1 SHA512 bd6e36c163f0d85e1ab1fc659464696b5a02c3864a800ad47e047fdc4a35fff4ef7dd28a9b071fa46f7f67fa45c97fdc77bc1f2bdbad80cc02950d73731d9c30
-EBUILD nethack-3.6.0-r3.ebuild 3998 BLAKE2B b6bb7165f57fa23fd7414bdd077abb65dfbab6d57c2e740c2b80c697a1bd957bd94347a35f5195e13633c6995866e2c62a9d8955de8569d6d07769d9381d052e SHA512 6d9baf22fa180eafb53460e21353be11ae45964a81a608f930052dafd93481dca9bf8002da65c4b84a191d2ad6dc4387e2363693694cc68f1d28a3ec9f09e152
-EBUILD nethack-3.6.1.ebuild 4342 BLAKE2B e41f459ca44597aa45148e18ad68eae18302724a88670a6c5f3c08630a1139dc8f1cb168fefbd925f40fcee48405c66e0c29155dfe0ac04ec1332ae036fc0cc4 SHA512 ae3cfed488814f71db02cee35abc937be8bb9b269b6ac5bff180374acea511d9f073b4d8a3fea8edd30b183331e3b6abf6156392bb6744d854ab0ba60fdf70d7
+EBUILD nethack-3.6.0-r3.ebuild 3987 BLAKE2B 3fa5991882760a322178eb8aba8ac736b0430490d4a6a9077b1122515a39e0640d923bb034fecbfcd5bb10ee8f3b0c7c49ac6df981750f5b6bcad44f2a4bfcde SHA512 c5d814878d2a97e055a327c057bfc59b73510e3bf16d49e23a180da71ebf5439a00462c1d1549a8f07553d5c813704a578ed7d95e5c4dfad0714c874ce60b93f
+EBUILD nethack-3.6.1.ebuild 4334 BLAKE2B d14c8e54e4a7bafb81d5ec3cf179400d05172477216b07419b279ffe00fd1c592243beac2533a5dc573608477a79f20cd349935afa06b081e7f21ae4941c84c8 SHA512 aa66e60527ceaf59aec817bf471c6abf9a830b6de49e80be28f4d6316ab381b136d4c7b34a576db377ab7135f3a5fc52022b7cd72fdd43493c5afb51180e2c48
 MISC metadata.xml 545 BLAKE2B a29d97fd41c3cce54fa206a2be25296be467499011ed128ed20ed9dcb99efe9fd429fd816fccd07805065831c348ee6479c93ad1e0bba2f98c5b6b50b738ee73 SHA512 30c9a569c25853311dd579749d4193f8a1a45c5a5dd0e7899c2b3c63a39718c0ff8a4633620fdcbb3964e714b62718bfd4089c7438e5707f24457b6ace4dc783
diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
index fa9302932cb1..834881ef5f28 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils toolchain-funcs flag-o-matic user
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_PV=${PV//.}
 DESCRIPTION="The ultimate old-school single player dungeon exploration game"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
 IUSE="experimental X"
 
-RDEPEND="sys-libs/ncurses:0=
+RDEPEND="acct-group/gamestat
+	sys-libs/ncurses:0=
 	X? (
 		x11-libs/libXaw
 		x11-libs/libXpm
@@ -35,8 +36,6 @@ NETHACK_GROUP="gamestat"
 
 pkg_setup() {
 	HACKDIR="/usr/$(get_libdir)/${PN}"
-
-	enewgroup gamestat 36
 }
 
 src_prepare() {
diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild b/games-roguelike/nethack/nethack-3.6.1.ebuild
index 783a9ec4f644..b2a450c706db 100644
--- a/games-roguelike/nethack/nethack-3.6.1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop flag-o-matic toolchain-funcs user
+inherit desktop flag-o-matic toolchain-funcs
 
 MY_PV=${PV//.}
 DESCRIPTION="The ultimate old-school single player dungeon exploration game"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="X"
 
-RDEPEND="sys-libs/ncurses:0=
+RDEPEND="acct-group/gamestat
+	sys-libs/ncurses:0=
 	X? (
 		x11-libs/libXaw
 		x11-libs/libXpm
@@ -96,8 +97,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	enewgroup gamestat 36
-
 	fowners root:gamestat /var/games/nethack /var/games/nethack/save
 	fperms 2770 /var/games/nethack /var/games/nethack/save