gentoo resync : 10.02.2020

3 files changed, 9 insertions, 68 deletions

diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index d6db825f064f..de752c4b47fd 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,6 +1,4 @@
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
-DIST tuned-2.10.0.tar.gz 160254 BLAKE2B 0a09b4b870ec153adc62de7811af561ddb3967d459b1d5e8b6f02c5ac036ed170ad3368d18fc1b3fd40649335035cce971a54e1eda8745c77e836a3b2d892a83 SHA512 e0674533f17ac27cd3647808cda1f51d9905f563521af8cb3ffd1854098d6e2ca1adac82e542e6bdf86cce7e659303464eac50b8823167360783a75843d02a60
 DIST tuned-2.13.0.tar.gz 193816 BLAKE2B 1e51a9da855f54db9ac8ed6e764c091d513c1101771422a62c7c501dc3c8741430eb3503803b408709868d16d4791fbedb9dbc088b36fb693f065a1b6054fa15 SHA512 d81b0a80f911fe808ca324319da3e42c3c15196c0c37343d33b45c2b34f33e205e2913d77ffda8598379a91ef72ab73d88d7b83a4684b6a067e3f36d98a85927
-EBUILD tuned-2.10.0.ebuild 1260 BLAKE2B 072a755292b5ce009d10ad07e534f556288e2a3c4e9bf39d92e9848f91c5d075d70ed6837824da7e7cef896f231cf48aeae5128e9c82204e5346ab4b8fc87581 SHA512 cd10e1561b88d5791b234ede308c280bbdcafb67e54314c381bec848f57b94e53f26fff3b3998a0852acfc892725fea94516b83a9ae32769918daa0928b328df
-EBUILD tuned-2.13.0.ebuild 1257 BLAKE2B 493f557310decdce8074fb5ef178d0225c422c0bdaf97e862fda9c098a3cf56cebfac65602eccac2a0c97aa3322f5b66ad104c4a0473a92a8cefd07c2e5bc69b SHA512 cd9828ce3304579c10628be032603d0cd41dc75ebe4b929c77d0193d1c2286244939a199d278bf38de1b1f763f28abcc630a5d83d7c0c3d989314a87a7d2d9f6
+EBUILD tuned-2.13.0-r1.ebuild 1328 BLAKE2B 43c9abb31c7253a9fa6c1e6734ade3cbff8e8a4f08756b8eb7e368719c86748637e1073ad5c4a3cbfce719e0ce36fd2a4b8f11c0ed4e6bcbeb19477408854da3 SHA512 fc8f6a57e78f8723a15a1d167fecf59242ec20d2cb70077fda0511907bc765c91d837f0a18d3d6208c24929ff0073ed484fb3c44d09ba245126013120ecf9592
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/tuned-2.10.0.ebuild b/sys-apps/tuned/tuned-2.10.0.ebuild
deleted file mode 100644
index 0d0931ccad3d..000000000000
--- a/sys-apps/tuned/tuned-2.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://fedorahosted.org/tuned/"
-SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-linux-procfs[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	sys-process/procps
-	dev-util/systemtap"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^PYTHON/s/= python3/= python2/g" \
-		-e "/^DOCDIR/s/$/&\-\$(VERSION)/g" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-apps/tuned/tuned-2.13.0.ebuild b/sys-apps/tuned/tuned-2.13.0-r1.ebuild
index fe231367c6c7..89a8dadb552a 100644
--- a/sys-apps/tuned/tuned-2.13.0.ebuild
+++ b/sys-apps/tuned/tuned-2.13.0-r1.ebuild
@@ -19,12 +19,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-linux-procfs[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyudev[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-linux-procfs[${PYTHON_MULTI_USEDEP}]
+	')"
 
 RDEPEND="
 	${DEPEND}