From 16ea9eebec61442474c6feb6b9a279633d8fb7cf Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 7 Sep 2016 21:25:54 -0400
Subject: sys-power/cpupower: add cpupower-frequency-set.service

Bug: https://bugs.gentoo.org/531360
---
 profiles/package.mask                              |  2 +-
 sys-power/cpupower/cpupower-4.5.0-r1.ebuild        | 61 ++++++++++++++++++++++
 sys-power/cpupower/cpupower-4.5.0.ebuild           | 56 --------------------
 sys-power/cpupower/cpupower-4.7.0-r1.ebuild        | 61 ++++++++++++++++++++++
 sys-power/cpupower/cpupower-4.7.0.ebuild           | 56 --------------------
 .../cpupower/files/cpupower-frequency-set.service  |  9 ++++
 .../files/cpupower-frequency-set.service.conf      |  2 +
 7 files changed, 134 insertions(+), 113 deletions(-)
 create mode 100644 sys-power/cpupower/cpupower-4.5.0-r1.ebuild
 delete mode 100644 sys-power/cpupower/cpupower-4.5.0.ebuild
 create mode 100644 sys-power/cpupower/cpupower-4.7.0-r1.ebuild
 delete mode 100644 sys-power/cpupower/cpupower-4.7.0.ebuild
 create mode 100644 sys-power/cpupower/files/cpupower-frequency-set.service
 create mode 100644 sys-power/cpupower/files/cpupower-frequency-set.service.conf

diff --git a/profiles/package.mask b/profiles/package.mask
index 0abb2fae8f7e..dd77ae2f4f47 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -597,7 +597,7 @@ dev-libs/skyutils
 # Mike Gilbert <floppym@gentoo.org> (07 Aug 2016)
 # Fails to switch cpufreq governor.
 # https://bugs.gentoo.org/590780
-=sys-power/cpupower-4.7.0
+~sys-power/cpupower-4.7.0
 
 # Pacho Ramos <pacho@gentoo.org> (7 Aug 2016)
 # Upstream dead, depends on old gstreamer, old webkit, many unresolved bug
diff --git a/sys-power/cpupower/cpupower-4.5.0-r1.ebuild b/sys-power/cpupower/cpupower-4.5.0-r1.ebuild
new file mode 100644
index 000000000000..54365d0183af
--- /dev/null
+++ b/sys-power/cpupower/cpupower-4.5.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# eutils: strip-linguas
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Shows and sets processor power related values"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpufreq_bench debug nls"
+
+# File collision w/ headers of the deprecated cpufrequtils
+RDEPEND="sys-apps/pciutils
+	!<sys-apps/linux-misc-apps-3.6-r2
+	!sys-power/cpufrequtils"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	nls? ( sys-devel/gettext )"
+
+src_compile() {
+	myemakeargs=(
+		DEBUG=$(usex debug true false)
+		V=1
+		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
+		NLS=$(usex nls true false)
+		docdir=/usr/share/doc/${PF}/${PN}
+		mandir=/usr/share/man
+		libdir=/usr/$(get_libdir)
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC)"
+		STRIP=true
+		OPTIMIZATION=
+		VERSION=${PV}
+	)
+
+	if [[ -n ${LINGUAS+set} ]]; then
+		strip-linguas -i po
+		myemakeargs+=( LANGUAGES="${LINGUAS}" )
+	fi
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" "${myemakeargs[@]}" install
+	dodoc README ToDo
+
+	newconfd "${FILESDIR}"/conf.d-r2 cpupower
+	newinitd "${FILESDIR}"/init.d-r4 cpupower
+
+	systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
+	systemd_install_serviced "${FILESDIR}"/cpupower-frequency-set.service.conf
+}
diff --git a/sys-power/cpupower/cpupower-4.5.0.ebuild b/sys-power/cpupower/cpupower-4.5.0.ebuild
deleted file mode 100644
index 432a45f45741..000000000000
--- a/sys-power/cpupower/cpupower-4.5.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Shows and sets processor power related values"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpufreq_bench debug nls"
-
-# File collision w/ headers of the deprecated cpufrequtils
-RDEPEND="sys-apps/pciutils
-	!<sys-apps/linux-misc-apps-3.6-r2
-	!sys-power/cpufrequtils"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	myemakeargs=(
-		DEBUG=$(usex debug true false)
-		V=1
-		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
-		NLS=$(usex nls true false)
-		docdir=/usr/share/doc/${PF}/${PN}
-		mandir=/usr/share/man
-		libdir=/usr/$(get_libdir)
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC)"
-		STRIP=true
-		OPTIMIZATION=
-		VERSION=${PV}
-	)
-
-	if [[ -n ${LINGUAS+set} ]]; then
-		strip-linguas -i po
-		myemakeargs+=( LANGUAGES="${LINGUAS}" )
-	fi
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${myemakeargs[@]}" install
-	dodoc README ToDo
-
-	newconfd "${FILESDIR}"/conf.d-r2 cpupower
-	newinitd "${FILESDIR}"/init.d-r4 cpupower
-}
diff --git a/sys-power/cpupower/cpupower-4.7.0-r1.ebuild b/sys-power/cpupower/cpupower-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..54365d0183af
--- /dev/null
+++ b/sys-power/cpupower/cpupower-4.7.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# eutils: strip-linguas
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Shows and sets processor power related values"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpufreq_bench debug nls"
+
+# File collision w/ headers of the deprecated cpufrequtils
+RDEPEND="sys-apps/pciutils
+	!<sys-apps/linux-misc-apps-3.6-r2
+	!sys-power/cpufrequtils"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	nls? ( sys-devel/gettext )"
+
+src_compile() {
+	myemakeargs=(
+		DEBUG=$(usex debug true false)
+		V=1
+		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
+		NLS=$(usex nls true false)
+		docdir=/usr/share/doc/${PF}/${PN}
+		mandir=/usr/share/man
+		libdir=/usr/$(get_libdir)
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC)"
+		STRIP=true
+		OPTIMIZATION=
+		VERSION=${PV}
+	)
+
+	if [[ -n ${LINGUAS+set} ]]; then
+		strip-linguas -i po
+		myemakeargs+=( LANGUAGES="${LINGUAS}" )
+	fi
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" "${myemakeargs[@]}" install
+	dodoc README ToDo
+
+	newconfd "${FILESDIR}"/conf.d-r2 cpupower
+	newinitd "${FILESDIR}"/init.d-r4 cpupower
+
+	systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
+	systemd_install_serviced "${FILESDIR}"/cpupower-frequency-set.service.conf
+}
diff --git a/sys-power/cpupower/cpupower-4.7.0.ebuild b/sys-power/cpupower/cpupower-4.7.0.ebuild
deleted file mode 100644
index 432a45f45741..000000000000
--- a/sys-power/cpupower/cpupower-4.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Shows and sets processor power related values"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpufreq_bench debug nls"
-
-# File collision w/ headers of the deprecated cpufrequtils
-RDEPEND="sys-apps/pciutils
-	!<sys-apps/linux-misc-apps-3.6-r2
-	!sys-power/cpufrequtils"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	myemakeargs=(
-		DEBUG=$(usex debug true false)
-		V=1
-		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
-		NLS=$(usex nls true false)
-		docdir=/usr/share/doc/${PF}/${PN}
-		mandir=/usr/share/man
-		libdir=/usr/$(get_libdir)
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC)"
-		STRIP=true
-		OPTIMIZATION=
-		VERSION=${PV}
-	)
-
-	if [[ -n ${LINGUAS+set} ]]; then
-		strip-linguas -i po
-		myemakeargs+=( LANGUAGES="${LINGUAS}" )
-	fi
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${myemakeargs[@]}" install
-	dodoc README ToDo
-
-	newconfd "${FILESDIR}"/conf.d-r2 cpupower
-	newinitd "${FILESDIR}"/init.d-r4 cpupower
-}
diff --git a/sys-power/cpupower/files/cpupower-frequency-set.service b/sys-power/cpupower/files/cpupower-frequency-set.service
new file mode 100644
index 000000000000..2d9ef35655af
--- /dev/null
+++ b/sys-power/cpupower/files/cpupower-frequency-set.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=CPU Frequency Scaling
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cpupower frequency-set $OPTS
+
+[Install]
+WantedBy=multiuser.target
diff --git a/sys-power/cpupower/files/cpupower-frequency-set.service.conf b/sys-power/cpupower/files/cpupower-frequency-set.service.conf
new file mode 100644
index 000000000000..969c8ab2f214
--- /dev/null
+++ b/sys-power/cpupower/files/cpupower-frequency-set.service.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="OPTS=-g ondemand"
-- 
cgit v1.2.3-65-gdbad