gentoo resync : 30.09.2020

6 files changed, 97 insertions, 51 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 158ed6f9434a..21730d8fb39c 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/gamemode/Manifest b/games-util/gamemode/Manifest
index ee24a8ec482b..cd9734955296 100644
--- a/games-util/gamemode/Manifest
+++ b/games-util/gamemode/Manifest
@@ -1,4 +1,4 @@
-DIST gamemode-1.2.tar.xz 38536 BLAKE2B af39b8c0585c522afa72238b8332a6a5301d36b3c53e50652a78c41788eae9f5cb319cad06eaf6f345c50f934e188df4c78d70efbad919dd6897d3350d14e568 SHA512 233602e5e93b6cfcc742510dafb00dc826000d0c8618a693e9a579dc3b31c546d22c0545084cfb78c6085226e6b0e26c066078bc1871d36d5fb90828cf63cea9
-EBUILD gamemode-1.2.ebuild 3297 BLAKE2B 083dfd5cb67d5b855c0992cf302643b585cf1e2cb7a3ab05dd3626e61b0371572fcdc4f655881752655d8f5a6248e2dcf421600c3285dbfc2f9a892ef6923a6d SHA512 619065fdc7332b2b202e6298769edef14b596a94ba25981488efa585380262c684b48877eeb3fe45fc3a601d0c6c4b82c772b3e9d4f1d19a18ec40c01aee1093
-EBUILD gamemode-9999.ebuild 3297 BLAKE2B 083dfd5cb67d5b855c0992cf302643b585cf1e2cb7a3ab05dd3626e61b0371572fcdc4f655881752655d8f5a6248e2dcf421600c3285dbfc2f9a892ef6923a6d SHA512 619065fdc7332b2b202e6298769edef14b596a94ba25981488efa585380262c684b48877eeb3fe45fc3a601d0c6c4b82c772b3e9d4f1d19a18ec40c01aee1093
+DIST gamemode-1.6.tar.xz 69916 BLAKE2B 2fbb680de4043a004a91005647208fd9ca25de250bffe97acc0cabea47dba90d1ef670478582203d616704ea1f5a771115aadef4971e1e41f078104116b08cc4 SHA512 7cb4f4dd51b35e3a0164092342be56ce70bf1a81a8ff071725b429378cf92a100e263bc33890d5f5e281ad87fb72e2f820cb716c5aedf14f387610dcb59eb690
+EBUILD gamemode-1.6.ebuild 4081 BLAKE2B 523fc99e01e1aebcad288dd512bea3cc36ee1f3e9befba642a6765061040e39f3a50bf3407c56b15fe38d0695a976830492ec8e70a44f5efaa7db60bb379a15b SHA512 ff3cd661e6c685d7187128f5e4d5f78622ce4f4b37665d348f07dd11264711ab9f55e398ba75784c616e72372e28e7f744b41064ed50fde78044bfbc425571be
+EBUILD gamemode-9999.ebuild 4081 BLAKE2B 523fc99e01e1aebcad288dd512bea3cc36ee1f3e9befba642a6765061040e39f3a50bf3407c56b15fe38d0695a976830492ec8e70a44f5efaa7db60bb379a15b SHA512 ff3cd661e6c685d7187128f5e4d5f78622ce4f4b37665d348f07dd11264711ab9f55e398ba75784c616e72372e28e7f744b41064ed50fde78044bfbc425571be
 MISC metadata.xml 530 BLAKE2B 14e10e8800bca7ad7e412916ee250a4c9dbc5ed78feb99fbb9ec1feb6cc60cbf96494676eaf48200781f9e25bd330d97e16e7cbd46120df79a3e7affb8361d7e SHA512 6a080b2ec0af531ef9c5d989927a2bef7dd8870c27a5edccc9e61bc9c35cb8bc11c1b781aa003dbca470a2c8172b10f5317be6cca6c6d3d6bef206e91fe7e75c
diff --git a/games-util/gamemode/gamemode-1.2.ebuild b/games-util/gamemode/gamemode-1.6.ebuild
index 45b778ba90e2..b84faf4b7183 100644
--- a/games-util/gamemode/gamemode-1.2.ebuild
+++ b/games-util/gamemode/gamemode-1.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit meson multilib-minimal ninja-utils user
+inherit meson multilib-minimal ninja-utils systemd
 
 DESCRIPTION="Optimise Linux system performance on demand"
 HOMEPAGE="https://github.com/FeralInteractive/gamemode"
@@ -22,18 +22,30 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="systemd elogind"
+
+REQUIRED_USE="^^ ( systemd elogind )"
 
 RDEPEND="
-	>=sys-apps/systemd-236[${MULTILIB_USEDEP}]
+	acct-group/gamemode
+	dev-libs/inih
+	sys-apps/dbus[${MULTILIB_USEDEP},systemd(+)=,elogind(-)=]
 	sys-auth/polkit
+	sys-libs/libcap
 "
 DEPEND="${RDEPEND}"
 
+DOCS=(
+	CHANGELOG.md
+	LICENSE.txt
+	README.md
+	example/gamemode.ini
+)
+
 pkg_pretend() {
 	elog
 	elog "GameMode needs a kernel capable of SCHED_ISO to use its soft realtime"
-	elog "feature. Examples of kernels providing that are sys-kernel/ck-source"
+	elog "feature. Examples of kernels providing that are sys-kernel/ck-sources"
 	elog "and sys-kernel/pf-sources."
 	elog
 	elog "Support for soft realtime is completely optional. It may provide the"
@@ -64,14 +76,18 @@ pkg_pretend() {
 }
 
 multilib_src_configure() {
-	local myconf=()
+	local emesonargs=(
+		-Dwith-sd-bus-provider=$(usex systemd "systemd" "elogind")
+		-Dwith-systemd-user-unit-dir="$(systemd_get_userunitdir)"
+	)
 	if ! multilib_is_native_abi; then
-		myconf+=(
+		emesonargs+=(
 			-Dwith-examples=false
-			-Dwith-daemon=false
+			-Dwith-sd-bus-provider=no-daemon
 		)
 	fi
-	meson_src_configure "${myconf[@]}"
+
+	meson_src_configure
 }
 
 multilib_src_compile() {
@@ -89,17 +105,28 @@ multilib_src_install() {
 }
 
 pkg_postinst() {
-	enewgroup gamemode
-
 	elog
-	elog "GameMode can renice your games. You need to be in the gamemode group for this to work."
+	elog "GameMode has optional support for adjusting nice and ioprio of games"
+	elog "running with it. You may need to adjust your PAM limits to make use"
+	elog "of this. You need to be in the gamemode group for this to work."
+	elog
 	elog "Run the following command as root to add your user:"
 	elog "# gpasswd -a USER gamemode  # with USER = your user name"
 	elog
-
-	elog "Enable and start the daemon in your systemd user instance, then add"
-	elog "LD_PRELOAD=\$LD_PRELOAD:/usr/\$LIB/libgamemodeauto.so %command%"
-	elog "to the start options of any steam game to enable the performance"
-	elog "governor as you start the game."
+	elog "You can run the following command to test your settings:"
+	elog
+	elog "# gamemoded -t"
+	elog
+	elog "GameMode supports GPU optimizations. It defaults to OFF. Any"
+	elog "damage resulting from usage of this is your own responsibility."
+	elog
+	elog "systemd user sessions will automatically run the daemon on demand,"
+	elog "it does not need to be enabled explicitly. Games not supporting"
+	elog "GameMode natively can still make use of it, just add"
+	elog
+	elog "gamemoderun %command%"
+	elog
+	elog "to the start options of any steam game to enable optimizations"
+	elog "automatically as you start the game."
 	elog
 }
diff --git a/games-util/gamemode/gamemode-9999.ebuild b/games-util/gamemode/gamemode-9999.ebuild
index 45b778ba90e2..b84faf4b7183 100644
--- a/games-util/gamemode/gamemode-9999.ebuild
+++ b/games-util/gamemode/gamemode-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit meson multilib-minimal ninja-utils user
+inherit meson multilib-minimal ninja-utils systemd
 
 DESCRIPTION="Optimise Linux system performance on demand"
 HOMEPAGE="https://github.com/FeralInteractive/gamemode"
@@ -22,18 +22,30 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="systemd elogind"
+
+REQUIRED_USE="^^ ( systemd elogind )"
 
 RDEPEND="
-	>=sys-apps/systemd-236[${MULTILIB_USEDEP}]
+	acct-group/gamemode
+	dev-libs/inih
+	sys-apps/dbus[${MULTILIB_USEDEP},systemd(+)=,elogind(-)=]
 	sys-auth/polkit
+	sys-libs/libcap
 "
 DEPEND="${RDEPEND}"
 
+DOCS=(
+	CHANGELOG.md
+	LICENSE.txt
+	README.md
+	example/gamemode.ini
+)
+
 pkg_pretend() {
 	elog
 	elog "GameMode needs a kernel capable of SCHED_ISO to use its soft realtime"
-	elog "feature. Examples of kernels providing that are sys-kernel/ck-source"
+	elog "feature. Examples of kernels providing that are sys-kernel/ck-sources"
 	elog "and sys-kernel/pf-sources."
 	elog
 	elog "Support for soft realtime is completely optional. It may provide the"
@@ -64,14 +76,18 @@ pkg_pretend() {
 }
 
 multilib_src_configure() {
-	local myconf=()
+	local emesonargs=(
+		-Dwith-sd-bus-provider=$(usex systemd "systemd" "elogind")
+		-Dwith-systemd-user-unit-dir="$(systemd_get_userunitdir)"
+	)
 	if ! multilib_is_native_abi; then
-		myconf+=(
+		emesonargs+=(
 			-Dwith-examples=false
-			-Dwith-daemon=false
+			-Dwith-sd-bus-provider=no-daemon
 		)
 	fi
-	meson_src_configure "${myconf[@]}"
+
+	meson_src_configure
 }
 
 multilib_src_compile() {
@@ -89,17 +105,28 @@ multilib_src_install() {
 }
 
 pkg_postinst() {
-	enewgroup gamemode
-
 	elog
-	elog "GameMode can renice your games. You need to be in the gamemode group for this to work."
+	elog "GameMode has optional support for adjusting nice and ioprio of games"
+	elog "running with it. You may need to adjust your PAM limits to make use"
+	elog "of this. You need to be in the gamemode group for this to work."
+	elog
 	elog "Run the following command as root to add your user:"
 	elog "# gpasswd -a USER gamemode  # with USER = your user name"
 	elog
-
-	elog "Enable and start the daemon in your systemd user instance, then add"
-	elog "LD_PRELOAD=\$LD_PRELOAD:/usr/\$LIB/libgamemodeauto.so %command%"
-	elog "to the start options of any steam game to enable the performance"
-	elog "governor as you start the game."
+	elog "You can run the following command to test your settings:"
+	elog
+	elog "# gamemoded -t"
+	elog
+	elog "GameMode supports GPU optimizations. It defaults to OFF. Any"
+	elog "damage resulting from usage of this is your own responsibility."
+	elog
+	elog "systemd user sessions will automatically run the daemon on demand,"
+	elog "it does not need to be enabled explicitly. Games not supporting"
+	elog "GameMode natively can still make use of it, just add"
+	elog
+	elog "gamemoderun %command%"
+	elog
+	elog "to the start options of any steam game to enable optimizations"
+	elog "automatically as you start the game."
 	elog
 }
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 48d7b4715110..7942c4e69ae6 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,9 +1,9 @@
 AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
 AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-2.22.1.tar.gz 12629381 BLAKE2B acec4f0f495a7abd78a663435b0a049f8be37320abea0d916c6a8f38b75c1f07683b60c9e20b8feb0533fdcfc881ac3069c87e8360be52f05afce63334ff1baa SHA512 98c84c3806d8ff632ebe9c1386f8b407f310ff58b0963406093dc9297faaf690a90b34387013f59c76fdd87055ecf8736b449f99131aaf9eb497970a4ee003b2
 DIST pyfa-2.24.1.tar.gz 12648921 BLAKE2B 5715d81144df32cad83eb21d7f8800eb9773139e9305402a5096c585362fcabd0d705529a8887a8c8092637b8348d2a7e8a77e1f6eb362fd83ea39a86203ccb4 SHA512 ffe8a6e9c9c9b593516d9ba76ccb9e69788124132de642f45f5527468645d46f75e4c2388bb5f01788eb85f3e535ade110cfffc92c2943d96f477b5652528328
-EBUILD pyfa-2.22.1.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
+DIST pyfa-2.28.3.tar.gz 12685191 BLAKE2B b73663479e39f8948de0ad0de3edb3a89b65bb5b6640332e8fed39f33b222fbc0f4b47487112b01895413fa751ee8dabcde2083a3f3a6b90fe0ad72b24165434 SHA512 7e432658eedb8dfbc9cd41d3ab7da3bf1d411e6935ad56434af1551eeae4de803f3d5447bff4fd5d569d20f1f3eca9acaa1ac22c163bec1ac7720807643b4187
 EBUILD pyfa-2.24.1.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
+EBUILD pyfa-2.28.3.ebuild 2653 BLAKE2B 5948ed19d3c7d541f07f288c5c412218abaf89b18a602347b2432e86b7501aa773492f87ee3df380b323f516f91cc9f77da401124de0a562973bb7064f310d47 SHA512 c97653fbfd494abe3246d25eab0df846a7357a2f65a5ade6238aca0895f07a0555cc2c77e7b1144cd49c1c92523c7e5375bbdcc7d034ef574378d84921f19ec8
 EBUILD pyfa-9999.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
 MISC metadata.xml 744 BLAKE2B b87f7086163bc63184cbc2ccae8d5db50dd7133d70dd1c737b8c7c180c3069550eb0eb4e216133236d62edfa066fcb7eded8702e16b17360230434a366d5d8ea SHA512 d52dc69cc53d2c6a6fffa3c8c097c74f6d6657d0cbb135bdb5bd9fb9e13a56c7b13deed6eec55d7a88617392543ea2a3a2a29d7c35140765a0f8a04b84b919c6
diff --git a/games-util/pyfa/pyfa-2.22.1.ebuild b/games-util/pyfa/pyfa-2.28.3.ebuild
index 00faae6993c0..50ffcdd37c25 100644
--- a/games-util/pyfa/pyfa-2.22.1.ebuild
+++ b/games-util/pyfa/pyfa-2.28.3.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 
-inherit desktop eutils python-single-r1 xdg-utils
+inherit desktop edos2unix python-single-r1 xdg
 
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/pyfa-org/Pyfa"
@@ -76,7 +76,7 @@ src_install() {
 	insinto /usr/share/${PN}
 
 	einfo "Creating database ..."
-	python ./db_update.py || die
+	${EPYTHON} ./db_update.py || die
 	doins eve.db
 
 	einfo "Compressing images ..."
@@ -90,11 +90,3 @@ src_install() {
 	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
 	domenu "${FILESDIR}/${PN}.desktop"
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}