[gentoo-commits] repo/gentoo:master commit in: sys-apps/tuned/files/, sys-apps/tuned/

[Yixun Lan]

commit:     0b853f0f984325e04f0b0e235cb45f1eef92b337
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 06:41:24 2020 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 06:41:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b853f0f

sys-apps/tuned: drop old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 sys-apps/tuned/Manifest                            |  2 -
 sys-apps/tuned/files/tuned-2.7.0-upstream.patch    | 39 --------------
 .../tuned/files/tuned-2.7.1-makefile-rpm.patch     | 19 -------
 sys-apps/tuned/files/tuned-2.7.1-sysctl.patch      | 11 ----
 sys-apps/tuned/tuned-2.7.0.ebuild                  | 49 ------------------
 sys-apps/tuned/tuned-2.7.1-r2.ebuild               | 51 -------------------
 sys-apps/tuned/tuned-2.7.1-r3.ebuild               | 59 ----------------------
 7 files changed, 230 deletions(-)

diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index 48a49f8969e..f25e76d623c 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,4 +1,2 @@
 DIST tuned-2.10.0.tar.gz 160254 BLAKE2B 0a09b4b870ec153adc62de7811af561ddb3967d459b1d5e8b6f02c5ac036ed170ad3368d18fc1b3fd40649335035cce971a54e1eda8745c77e836a3b2d892a83 SHA512 e0674533f17ac27cd3647808cda1f51d9905f563521af8cb3ffd1854098d6e2ca1adac82e542e6bdf86cce7e659303464eac50b8823167360783a75843d02a60
 DIST tuned-2.13.0.tar.gz 193816 BLAKE2B 1e51a9da855f54db9ac8ed6e764c091d513c1101771422a62c7c501dc3c8741430eb3503803b408709868d16d4791fbedb9dbc088b36fb693f065a1b6054fa15 SHA512 d81b0a80f911fe808ca324319da3e42c3c15196c0c37343d33b45c2b34f33e205e2913d77ffda8598379a91ef72ab73d88d7b83a4684b6a067e3f36d98a85927
-DIST tuned-2.7.0.tar.bz2 107541 BLAKE2B b26924a091fd78bbc7e61c8a45b49808d132eb5ebd3fdc00f96be7eaddcffd88183fa59595a29e2c402b2c434bfdb706601d397c2ebca9a5822c6a3416373465 SHA512 ce09dd854e89762fa376f7f63a59feb384940b5dbc5ad74370b33bbda3f060f09e79d2988de3535b072ad749ab7be43ccaaa46a343a9df50eec6c40d7ab85d55
-DIST tuned-2.7.1.tar.bz2 107471 BLAKE2B c9259ee5ce502100edc7c537f6857de3a6af4af0be1773e0c9422c10de16b4a513d514532da26764b0a743f943577d527919f329ff48a012e269fd2a0ac59f10 SHA512 4a4785e3d20ed7f1c2969066676f5fa3d8286b500de1c63169d745e701e1410092d29429d25c13c3515d37ef73dd297945d69db176d693d4152bfbe9ba626833

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 f864433b194..00000000000
--- 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@××××××.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 408ef2b73c3..00000000000
--- 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 8e2a70fc377..00000000000
--- 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 94d7224a94c..00000000000
--- 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 be0e99e3ef4..00000000000
--- 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 99c6ce5840b..00000000000
--- 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}"
-}