gentoo resync : 22.02.2020

7 files changed, 2 insertions, 236 deletions

diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index 24265a35b894..d6db825f064f 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,12 +1,6 @@
-AUX tuned-2.7.0-upstream.patch 1261 BLAKE2B 71b534a5e170056e1a2301d328377432fdc786c61891bba72c186cf2d8b5f813b1664c91d5bfb9367be114daf26e084172f40d3f201b5ba94f36c1187c8b132f SHA512 f2002184dd1d9b6f40c90ba5d205e66ccae0a546ab20fcf8b76d703ab712f7871d5d0c0bf5ab025dffab861e066a991e0304894c9607fecd4a8102fa3973d8a4
-AUX tuned-2.7.1-makefile-rpm.patch 885 BLAKE2B 383ed2baab24bf0450211dbd016e0e7ca7c3cad28d4bfc6a64e761180bb48dc396e243f5f1bf4dd1a8cf47ef3c9f5cc81d9f436885748818a9b1b68b49cdac02 SHA512 51b8b299c15aa225f4de473150a05acfe2b669c494f4ab364c0e2f278282b7b64945963623cc778c9742d175efa875ca8c1957e50a55536598dd7c9ae8959636
-AUX tuned-2.7.1-sysctl.patch 328 BLAKE2B a86ab64b46196516dae5164d779df2f30cbfd6becdda0aa5d5ba135730a72f129899ba36b2f4c8103035d8a4ab24e58f8cbff9fd5444769b18f92fee870ca94f SHA512 7c6fa6a9425e9955c019ad192476d802cf7870e33ca713f29ec203d157f495f3cf62c9965faddf5db39113285e51e5eb03d72111fab654efc8fbb8d38f08e75c
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
 DIST tuned-2.10.0.tar.gz 160254 BLAKE2B 0a09b4b870ec153adc62de7811af561ddb3967d459b1d5e8b6f02c5ac036ed170ad3368d18fc1b3fd40649335035cce971a54e1eda8745c77e836a3b2d892a83 SHA512 e0674533f17ac27cd3647808cda1f51d9905f563521af8cb3ffd1854098d6e2ca1adac82e542e6bdf86cce7e659303464eac50b8823167360783a75843d02a60
-DIST tuned-2.7.0.tar.bz2 107541 BLAKE2B b26924a091fd78bbc7e61c8a45b49808d132eb5ebd3fdc00f96be7eaddcffd88183fa59595a29e2c402b2c434bfdb706601d397c2ebca9a5822c6a3416373465 SHA512 ce09dd854e89762fa376f7f63a59feb384940b5dbc5ad74370b33bbda3f060f09e79d2988de3535b072ad749ab7be43ccaaa46a343a9df50eec6c40d7ab85d55
-DIST tuned-2.7.1.tar.bz2 107471 BLAKE2B c9259ee5ce502100edc7c537f6857de3a6af4af0be1773e0c9422c10de16b4a513d514532da26764b0a743f943577d527919f329ff48a012e269fd2a0ac59f10 SHA512 4a4785e3d20ed7f1c2969066676f5fa3d8286b500de1c63169d745e701e1410092d29429d25c13c3515d37ef73dd297945d69db176d693d4152bfbe9ba626833
+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.7.0.ebuild 1110 BLAKE2B 52ec7c2aedbf50d9433d535143c98868933e21c99ef4c715b7c76b5e561959061d99252943e911133d970bf0795f0dfb44e0ae40f439174d8c650d9f55f21679 SHA512 f745d80d4c25138f051764fa48af016c76cf9fac770b19b10f8901dcc010040ffaeb7d137e3685e90dbda331cecf48f0cf0abac97a95473f8f0cc0abdae0206e
-EBUILD tuned-2.7.1-r2.ebuild 1109 BLAKE2B 6cff0b820535bc77ee89aa35c3571e1e56b6f0d9424d922d60e56e519053d90128051ee571fad8015073983d2725284ac2931cb0a93a772750fc3f71722eac8c SHA512 4b4ef8ca04d2451bc084fe6654676ea50eb707df880fb3989d88d7728c73f5f2dc38a1d855a28a141eb4cc2d7d6f9e7087c291689504854a6946d8ffdd1ef1cc
-EBUILD tuned-2.7.1-r3.ebuild 1113 BLAKE2B 978491459acfac39947ef6f8ad9d903d92081071b835bfc3539265e636be92406cb3acffafbcbd359a5f2aa88e289f7f4d6737bb304d1c56ba5e7dc8fb1ddd41 SHA512 c38175c8ab81d06d65c9d61ea3d3cd3586da8c846a2d589fc56fbc0470b40587adb3ba98db53f0d142d5252b41e225655c186a03de96ed4377029e09d45cdcd8
+EBUILD tuned-2.13.0.ebuild 1257 BLAKE2B 493f557310decdce8074fb5ef178d0225c422c0bdaf97e862fda9c098a3cf56cebfac65602eccac2a0c97aa3322f5b66ad104c4a0473a92a8cefd07c2e5bc69b SHA512 cd9828ce3304579c10628be032603d0cd41dc75ebe4b929c77d0193d1c2286244939a199d278bf38de1b1f763f28abcc630a5d83d7c0c3d989314a87a7d2d9f6
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/files/tuned-2.7.0-upstream.patch b/sys-apps/tuned/files/tuned-2.7.0-upstream.patch
deleted file mode 100644
index f864433b1941..000000000000
--- a/sys-apps/tuned/files/tuned-2.7.0-upstream.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/tuned-gui.py b/tuned-gui.py
-index 0555404..b169dec 100755
---- a/tuned-gui.py
-+++ b/tuned-gui.py
-@@ -89,7 +89,7 @@ class Base(object):
- 		try:
- 			self.controller = \
- 				tuned.admin.DBusController(consts.DBUS_BUS,
--					consts.DBUS_OBJECT, consts.DBUS_INTERFACE)
-+					consts.DBUS_INTERFACE, consts.DBUS_OBJECT)
- 			self.controller.is_running()
- 		except tuned.admin.exceptions.TunedAdminDBusException, ex:
- 			response = self.tuned_daemon_exception_dialog.run()
-diff --git a/tuned.spec b/tuned.spec
-index 3a2dcec..1b46daf 100644
---- a/tuned.spec
-+++ b/tuned.spec
-@@ -334,8 +334,6 @@ fi
- %changelog
- * Tue Jul 19 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.7.0-1
- - new-release
--  - rebase tuned to latest upstream
--    resolves: rhbz#1289048
-   - gui: fixed save profile
-     resolves: rhbz#1242491
-   - tuned-adm: added --ignore-missing parameter
-diff --git a/tuned/admin/admin.py b/tuned/admin/admin.py
-index ad501c0..cbdd1be 100644
---- a/tuned/admin/admin.py
-+++ b/tuned/admin/admin.py
-@@ -98,7 +98,7 @@ class Admin(object):
- 
- 	def _action_list(self):
- 		self._print_profiles(self._profiles_locator.get_known_names_summary())
--		self._action_dbus_active()
-+		self._action_active()
- 		return True
- 
- 	def _dbus_get_active_profile(self):
diff --git a/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch b/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch
deleted file mode 100644
index 408ef2b73c3a..000000000000
--- a/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Makefile b/Makefile
-index df2a139..6200cae 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,8 +19,12 @@ else
- 	GIT_PSUFFIX = .$(GIT_SUFFIX)
- 	RPM_VERSION = $(NAME)-$(VERSION)-1$(GIT_PSUFFIX)
- endif
--UNITDIR = $(shell rpm --eval '%{_unitdir}' 2>/dev/null || echo /usr/lib/systemd/system)
--TMPFILESDIR = $(shell rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo /usr/lib/tmpfiles.d)
-+UNITDIR_FALLBACK = /usr/lib/systemd/system
-+UNITDIR_DETECT = $(shell rpm --eval '%{_unitdir}' 2>/dev/null || echo $(UNITDIR_FALLBACK))
-+UNITDIR = $(UNITDIR_DETECT:%{_unitdir}=$(UNITDIR_FALLBACK))
-+TMPFILESDIR_FALLBACK = /usr/lib/tmpfiles.d
-+TMPFILESDIR_DETECT = $(shell rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo $(TMPFILESDIR_FALLBACK))
-+TMPFILESDIR = $(TMPFILESDIR_DETECT:%{_tmpfilesdir}=$(TMPFILESDIR_FALLBACK))
- VERSIONED_NAME = $(NAME)-$(VERSION)$(GIT_PSUFFIX)
- 
- DATADIR = /usr/share
diff --git a/sys-apps/tuned/files/tuned-2.7.1-sysctl.patch b/sys-apps/tuned/files/tuned-2.7.1-sysctl.patch
deleted file mode 100644
index 8e2a70fc377d..000000000000
--- a/sys-apps/tuned/files/tuned-2.7.1-sysctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tuned/plugins/plugin_sysctl.py
-+++ b/tuned/plugins/plugin_sysctl.py
-@@ -67,7 +67,7 @@
- 			self._write_sysctl(option, value)
- 
- 	def _execute_sysctl(self, arguments):
--		execute = ["/sbin/sysctl"] + arguments
-+		execute = ["sysctl"] + arguments
- 		log.debug("executing %s" % execute)
- 		return self._cmd.execute(execute)
- 
diff --git a/sys-apps/tuned/tuned-2.7.0.ebuild b/sys-apps/tuned/tuned-2.7.0.ebuild
deleted file mode 100644
index 94d7224a94c2..000000000000
--- a/sys-apps/tuned/tuned-2.7.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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://fedorahosted.org/releases/t/u/tuned/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_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}]
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	sys-power/powertop
-	dev-util/systemtap
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-upstream.patch
-
-	sed -i \
-		-e "/^UNITDIR = /s:\$(shell rpm --eval '%{_unitdir}'):$(systemd_get_unitdir):" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		Makefile ||die
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/tuned.initd  tuned
-
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-apps/tuned/tuned-2.7.1-r2.ebuild b/sys-apps/tuned/tuned-2.7.1-r2.ebuild
deleted file mode 100644
index be0e99e3ef44..000000000000
--- a/sys-apps/tuned/tuned-2.7.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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://fedorahosted.org/releases/t/u/tuned/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_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}]
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	sys-process/procps
-	dev-util/systemtap
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysctl.patch
-	epatch "${FILESDIR}"/${P}-makefile-rpm.patch
-
-	sed -i \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		Makefile ||die
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/tuned.initd  tuned
-
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-apps/tuned/tuned-2.7.1-r3.ebuild b/sys-apps/tuned/tuned-2.7.1-r3.ebuild
deleted file mode 100644
index 99c6ce5840b7..000000000000
--- a/sys-apps/tuned/tuned-2.7.1-r3.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://fedorahosted.org/releases/t/u/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-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}]"
-
-DEPEND="
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	sys-process/procps
-	dev-util/systemtap"
-
-PATCHES=(
-	"${FILESDIR}/${P}-sysctl.patch"
-	"${FILESDIR}/${P}-makefile-rpm.patch"
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${ED}"
-}