[gentoo-commits] repo/gentoo:master commit in: sys-apps/tuned/, sys-apps/tuned/files/
commit: 880e3375c1d7a09c7f8372065279032cba474e96 Author: Yixun Lan gentoo org> AuthorDate: Tue Nov 1 16:13:25 2016 + Commit: Yixun Lan gentoo org> CommitDate: Tue Nov 1 16:15:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880e3375 sys-apps/tuned: fix rpm lookup err Gentoo-Bug: 563396 Package-Manager: portage-2.3.2 sys-apps/tuned/files/tuned-2.7.1-makefile.patch | 15 +++ sys-apps/tuned/tuned-2.7.1-r2.ebuild| 52 + 2 files changed, 67 insertions(+) diff --git a/sys-apps/tuned/files/tuned-2.7.1-makefile.patch b/sys-apps/tuned/files/tuned-2.7.1-makefile.patch new file mode 100644 index ..54e89a1 --- /dev/null +++ b/sys-apps/tuned/files/tuned-2.7.1-makefile.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index 9e2d8fe..6de30d0 100644 +--- a/Makefile b/Makefile +@@ -19,8 +19,8 @@ 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 = $(shell if which rpm > /dev/null 2>&1; then rpm --eval '%{_unitdir}' 2>/dev/null; else echo /usr/lib/systemd/system; fi) ++TMPFILESDIR = $(shell if which rpm > /dev/null 2>&1; then rpm --eval '%{_tmpfilesdir}' 2>/dev/null; else echo /usr/lib/tmpfiles.d; fi) + VERSIONED_NAME = $(NAME)-$(VERSION)$(GIT_PSUFFIX) + + DATADIR = /usr/share diff --git a/sys-apps/tuned/tuned-2.7.1-r2.ebuild b/sys-apps/tuned/tuned-2.7.1-r2.ebuild new file mode 100644 index ..6c58913 --- /dev/null +++ b/sys-apps/tuned/tuned-2.7.1-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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.patch + + sed -i \ + -e "/\$(DESTDIR)\/run\/tuned/d" \ + Makefile ||die +} + +src_install() { + default + newinitd "${FILESDIR}"/tuned.initd tuned + + python_fix_shebang "${ED}" +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/tuned/, sys-apps/tuned/files/
commit: ea9c4bec20b6bfe89b481d94c77a8823b7a7cd1a Author: Yixun Lan gentoo org> AuthorDate: Mon Aug 15 07:19:40 2016 + Commit: Yixun Lan gentoo org> CommitDate: Mon Aug 15 07:51:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9c4bec sys-apps/tuned: drop old Package-Manager: portage-2.3.0 sys-apps/tuned/Manifest | 1 - sys-apps/tuned/files/tuned-2.6.0-pygobject.patch | 46 sys-apps/tuned/tuned-2.6.0-r1.ebuild | 47 - sys-apps/tuned/tuned-2.6.0-r2.ebuild | 54 4 files changed, 148 deletions(-) diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest index 4a62b83..8441980 100644 --- a/sys-apps/tuned/Manifest +++ b/sys-apps/tuned/Manifest @@ -1,3 +1,2 @@ -DIST tuned-2.6.0.tar.bz2 98362 SHA256 945c785b8020960d2665b570b3168c366e6b82399801952aea54b4d178dac876 SHA512 da818cb6c04e10d97b7eb52fb37500128ca5b37c79428d1b84578d4147507a210052c395f523f91907a112e282a47f9a5d4745fe2960471f42d5d09f87a3c57d WHIRLPOOL 23457c5e161675f90326060d485626f2d176e6c42b34f21fceecf7299c21607b8537ff741742015c0045c8150ce379a7274b11da547581e18bea97671c1b4045 DIST tuned-2.7.0.tar.bz2 107541 SHA256 8f50718264690732504486a65931d7ef558d4d43da9a86bc6f5c6855e3a7e448 SHA512 ce09dd854e89762fa376f7f63a59feb384940b5dbc5ad74370b33bbda3f060f09e79d2988de3535b072ad749ab7be43ccaaa46a343a9df50eec6c40d7ab85d55 WHIRLPOOL 272e77e429097f9c14beb31f5d911762837008a0e8affeb9abbcaf03172edd8296064b1926ff56f0c1272a9a51d88cf9044ee4b45676844cb249d5be1865983c DIST tuned-2.7.1.tar.bz2 107471 SHA256 0eda9f3744ec214b1c20d0f79528a6438dafd5c79ff459b411414491802d SHA512 4a4785e3d20ed7f1c2969066676f5fa3d8286b500de1c63169d745e701e1410092d29429d25c13c3515d37ef73dd297945d69db176d693d4152bfbe9ba626833 WHIRLPOOL 847d37179190565299350796b7f548b342db309d6cadd7856b575c614cee38dcbcf856079fb59a565b536fadfb49c7ff2ab7068b38dab4a8ce12868baa16d968 diff --git a/sys-apps/tuned/files/tuned-2.6.0-pygobject.patch b/sys-apps/tuned/files/tuned-2.6.0-pygobject.patch deleted file mode 100644 index 832a413..000 --- a/sys-apps/tuned/files/tuned-2.6.0-pygobject.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8b60a06dbc90e96c5b08a43e062286c979f7b333 Mon Sep 17 00:00:00 2001 -From: Yixun Lan-Date: Fri, 15 Jul 2016 14:17:47 +0800 -Subject: [PATCH] pygobject: fix import Gtk without specify version error - -Signed-off-by: Yixun Lan - tuned-gui.py | 22 +++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -diff --git a/tuned-gui.py b/tuned-gui.py -index b525e8d..0555404 100755 a/tuned-gui.py -+++ b/tuned-gui.py -@@ -24,9 +24,25 @@ Created on Oct 15, 2013 - - @author: mstana - ''' -- --import gi.repository.GObject as GObject --import gi.repository.Gtk as Gtk -+try: -+import gi -+except ImportError: -+raise ImportError("Gtk3 backend requires pygobject to be installed.") -+ -+try: -+gi.require_version("Gtk", "3.0") -+except AttributeError: -+raise ImportError( -+"pygobject version too old -- it must have require_version") -+except ValueError: -+raise ImportError( -+"Gtk3 backend requires the GObject introspection bindings for Gtk 3 " -+"to be installed.") -+ -+try: -+from gi.repository import Gtk, GObject -+except ImportError: -+raise ImportError("Gtk3 backend requires pygobject to be installed.") - - import sys - import os --- -2.9.0 - diff --git a/sys-apps/tuned/tuned-2.6.0-r1.ebuild b/sys-apps/tuned/tuned-2.6.0-r1.ebuild deleted file mode 100644 index 94208cb..000 --- a/sys-apps/tuned/tuned-2.6.0-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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}] -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - sys-apps/dbus - sys-power/powertop - dev-util/systemtap -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_prepare() { - 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.6.0-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-apps/tuned/, sys-apps/tuned/files/
commit: cdaadf65e31a8b72908898fd9ee1da7108fdcc42 Author: Yixun Lan gentoo org> AuthorDate: Tue Jul 26 06:23:00 2016 + Commit: Yixun Lan gentoo org> CommitDate: Tue Jul 26 06:23:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdaadf65 sys-apps/tuned: version bump 2.7.0 Package-Manager: portage-2.3.0 sys-apps/tuned/Manifest | 1 + sys-apps/tuned/files/tuned-2.7.0-upstream.patch | 39 +++ sys-apps/tuned/tuned-2.7.0.ebuild | 50 + 3 files changed, 90 insertions(+) diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest index 240ac2f..a59333d 100644 --- a/sys-apps/tuned/Manifest +++ b/sys-apps/tuned/Manifest @@ -1 +1,2 @@ DIST tuned-2.6.0.tar.bz2 98362 SHA256 945c785b8020960d2665b570b3168c366e6b82399801952aea54b4d178dac876 SHA512 da818cb6c04e10d97b7eb52fb37500128ca5b37c79428d1b84578d4147507a210052c395f523f91907a112e282a47f9a5d4745fe2960471f42d5d09f87a3c57d WHIRLPOOL 23457c5e161675f90326060d485626f2d176e6c42b34f21fceecf7299c21607b8537ff741742015c0045c8150ce379a7274b11da547581e18bea97671c1b4045 +DIST tuned-2.7.0.tar.bz2 107541 SHA256 8f50718264690732504486a65931d7ef558d4d43da9a86bc6f5c6855e3a7e448 SHA512 ce09dd854e89762fa376f7f63a59feb384940b5dbc5ad74370b33bbda3f060f09e79d2988de3535b072ad749ab7be43ccaaa46a343a9df50eec6c40d7ab85d55 WHIRLPOOL 272e77e429097f9c14beb31f5d911762837008a0e8affeb9abbcaf03172edd8296064b1926ff56f0c1272a9a51d88cf9044ee4b45676844cb249d5be1865983c diff --git a/sys-apps/tuned/files/tuned-2.7.0-upstream.patch b/sys-apps/tuned/files/tuned-2.7.0-upstream.patch new file mode 100644 index 000..f864433 --- /dev/null +++ b/sys-apps/tuned/files/tuned-2.7.0-upstream.patch @@ -0,0 +1,39 @@ +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- 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/tuned-2.7.0.ebuild b/sys-apps/tuned/tuned-2.7.0.ebuild new file mode 100644 index 000..33e0073 --- /dev/null +++ b/sys-apps/tuned/tuned-2.7.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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}" +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/tuned/, sys-apps/tuned/files/
commit: 519ea089efa6a481624a643cea7d143f702a8681 Author: Yixun Lan gentoo org> AuthorDate: Fri Jul 15 06:36:17 2016 + Commit: Yixun Lan gentoo org> CommitDate: Fri Jul 15 06:40:22 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519ea089 sys-apps/tuned: fix missing dev-python/pygobject dep Gentoo-Bug: 587636 Package-Manager: portage-2.3.0_rc1 Signed-off-by: Yixun Lan gentoo.org> sys-apps/tuned/files/tuned-2.6.0-pygobject.patch | 46 sys-apps/tuned/tuned-2.6.0-r2.ebuild | 54 2 files changed, 100 insertions(+) diff --git a/sys-apps/tuned/files/tuned-2.6.0-pygobject.patch b/sys-apps/tuned/files/tuned-2.6.0-pygobject.patch new file mode 100644 index 000..832a413 --- /dev/null +++ b/sys-apps/tuned/files/tuned-2.6.0-pygobject.patch @@ -0,0 +1,46 @@ +From 8b60a06dbc90e96c5b08a43e062286c979f7b333 Mon Sep 17 00:00:00 2001 +From: Yixun Lan+Date: Fri, 15 Jul 2016 14:17:47 +0800 +Subject: [PATCH] pygobject: fix import Gtk without specify version error + +Signed-off-by: Yixun Lan +--- + tuned-gui.py | 22 +++--- + 1 file changed, 19 insertions(+), 3 deletions(-) + +diff --git a/tuned-gui.py b/tuned-gui.py +index b525e8d..0555404 100755 +--- a/tuned-gui.py b/tuned-gui.py +@@ -24,9 +24,25 @@ Created on Oct 15, 2013 + + @author: mstana + ''' +- +-import gi.repository.GObject as GObject +-import gi.repository.Gtk as Gtk ++try: ++import gi ++except ImportError: ++raise ImportError("Gtk3 backend requires pygobject to be installed.") ++ ++try: ++gi.require_version("Gtk", "3.0") ++except AttributeError: ++raise ImportError( ++"pygobject version too old -- it must have require_version") ++except ValueError: ++raise ImportError( ++"Gtk3 backend requires the GObject introspection bindings for Gtk 3 " ++"to be installed.") ++ ++try: ++from gi.repository import Gtk, GObject ++except ImportError: ++raise ImportError("Gtk3 backend requires pygobject to be installed.") + + import sys + import os +-- +2.9.0 + diff --git a/sys-apps/tuned/tuned-2.6.0-r2.ebuild b/sys-apps/tuned/tuned-2.6.0-r2.ebuild new file mode 100644 index 000..728b7de --- /dev/null +++ b/sys-apps/tuned/tuned-2.6.0-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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}-pygobject.patch + + sed -i \ + -e "/^UNITDIR = /s:\$(shell rpm --eval '%{_unitdir}'):$(systemd_get_unitdir):" \ + -e "/\$(DESTDIR)\/run\/tuned/d" \ + Makefile ||die + + sed -i \ + -i "s:/usr/bin/lsblk:/bin/lsblk:g" \ + tuned/plugins/plugin_mounts.py || die +} + +src_install() { + default + newinitd "${FILESDIR}"/tuned.initd tuned + + python_fix_shebang "${ED}" +}