public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-power/cpudyn/files/, sys-power/cpudyn/
@ 2016-04-29 19:32 Austin English
  0 siblings, 0 replies; 2+ messages in thread
From: Austin English @ 2016-04-29 19:32 UTC (permalink / raw
  To: gentoo-commits

commit:     e5fb79a92fe0bc1dd4a7b38db2ee19383584e66b
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 19:16:09 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 19:32:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5fb79a9

sys-power/cpudyn: use #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/573846

Package-Manager: portage-2.2.26

 sys-power/cpudyn/cpudyn-1.0.1-r2.ebuild | 49 +++++++++++++++++++++++++++++++++
 sys-power/cpudyn/files/cpudyn.init      |  4 +--
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/sys-power/cpudyn/cpudyn-1.0.1-r2.ebuild b/sys-power/cpudyn/cpudyn-1.0.1-r2.ebuild
new file mode 100644
index 0000000..e01be7e
--- /dev/null
+++ b/sys-power/cpudyn/cpudyn-1.0.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A daemon to control laptop power consumption via cpufreq and disk standby"
+HOMEPAGE="http://freecode.com/projects/cpudyn/"
+SRC_URI="http://mnm.uib.es/~gallir/${PN}/download/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.99.0-init_conf_updates.patch"
+)
+
+src_prepare() {
+	# fix #570082 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" cpudynd
+}
+
+src_install() {
+	dosbin cpudynd
+
+	doman cpudynd.8
+	dodoc INSTALL README VERSION changelog
+	docinto html
+	dodoc *.html
+
+	newinitd "${FILESDIR}"/cpudyn.init cpudyn
+	newconfd debian/cpudyn.conf cpudyn
+}
+
+pkg_postinst() {
+	einfo "Configuration file is /etc/conf.d/cpudyn."
+}

diff --git a/sys-power/cpudyn/files/cpudyn.init b/sys-power/cpudyn/files/cpudyn.init
index 877f51f..11e82db 100644
--- a/sys-power/cpudyn/files/cpudyn.init
+++ b/sys-power/cpudyn/files/cpudyn.init
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 #


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-power/cpudyn/files/, sys-power/cpudyn/
@ 2017-03-13  0:15 Michael Palimaka
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2017-03-13  0:15 UTC (permalink / raw
  To: gentoo-commits

commit:     989d20b988b095c9ef6e9521d25f30be4c1c35e5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 00:13:56 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 00:15:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=989d20b9

sys-power/cpudyn: remove last rited package

 sys-power/cpudyn/Manifest                          |   1 -
 sys-power/cpudyn/cpudyn-1.0.1-r2.ebuild            |  48 ----------
 sys-power/cpudyn/cpudyn-1.0.1.ebuild               |  40 --------
 .../files/cpudyn-0.99.0-init_conf_updates.patch    |  29 ------
 sys-power/cpudyn/files/cpudyn.init                 | 101 ---------------------
 sys-power/cpudyn/metadata.xml                      |   5 -
 6 files changed, 224 deletions(-)

diff --git a/sys-power/cpudyn/Manifest b/sys-power/cpudyn/Manifest
deleted file mode 100644
index 3c63de0ac8e..00000000000
--- a/sys-power/cpudyn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cpudyn-1.0.1.tgz 32285 SHA256 bc196ad17c04aa4bb21fdf9f6976e658d1d89cf736405a3faec93fd0e14df227 SHA512 e820cbdd175f264ff28f536e8bf5b9dc16a1453889d22fe3f526b940a0bd1d8ba30a7db91e312294e1c0b548d497f761399b5dd9a6dfe1659ecebdab2be97561 WHIRLPOOL 973a26885615c1b53f7699737326455fa9694c00164a8c9e0760300d0900075261ecd40d792cf820a5754f059ec41894a8d801f6c70b4bf922b88db3feefe962

diff --git a/sys-power/cpudyn/cpudyn-1.0.1-r2.ebuild b/sys-power/cpudyn/cpudyn-1.0.1-r2.ebuild
deleted file mode 100644
index 1515c24d74a..00000000000
--- a/sys-power/cpudyn/cpudyn-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A daemon to control laptop power consumption via cpufreq and disk standby"
-HOMEPAGE="http://freecode.com/projects/cpudyn/"
-SRC_URI="http://mnm.uib.es/~gallir/${PN}/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.99.0-init_conf_updates.patch"
-)
-
-src_prepare() {
-	# fix #570082 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	default
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" cpudynd
-}
-
-src_install() {
-	dosbin cpudynd
-
-	doman cpudynd.8
-	dodoc INSTALL README VERSION changelog
-	docinto html
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/cpudyn.init cpudyn
-	newconfd debian/cpudyn.conf cpudyn
-}
-
-pkg_postinst() {
-	einfo "Configuration file is /etc/conf.d/cpudyn."
-}

diff --git a/sys-power/cpudyn/cpudyn-1.0.1.ebuild b/sys-power/cpudyn/cpudyn-1.0.1.ebuild
deleted file mode 100644
index 184e2781d57..00000000000
--- a/sys-power/cpudyn/cpudyn-1.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="A daemon to control laptop power consumption via cpufreq and disk standby"
-HOMEPAGE="http://mnm.uib.es/~gallir/cpudyn/"
-SRC_URI="http://mnm.uib.es/~gallir/${PN}/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/debian
-	epatch "${FILESDIR}"/${PN}-0.99.0-init_conf_updates.patch
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" cpudynd || die "Compilation failed."
-}
-
-src_install() {
-	dosbin cpudynd || die "dosbin"
-
-	doman cpudynd.8
-	dodoc INSTALL README VERSION changelog
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/cpudyn.init cpudyn
-	newconfd debian/cpudyn.conf cpudyn
-}
-
-pkg_postinst() {
-	einfo "Configuration file is /etc/conf.d/cpudyn."
-}

diff --git a/sys-power/cpudyn/files/cpudyn-0.99.0-init_conf_updates.patch b/sys-power/cpudyn/files/cpudyn-0.99.0-init_conf_updates.patch
deleted file mode 100644
index f6aca0b7a9f..00000000000
--- a/sys-power/cpudyn/files/cpudyn-0.99.0-init_conf_updates.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- cpudyn/debian/cpudyn.conf.orig	2004-01-08 17:20:39.575230665 +0100
-+++ cpudyn/debian/cpudyn.conf	2004-01-08 17:20:37.450290151 +0100
-@@ -32,6 +32,12 @@
- 
- THROTTLING_LOW=7
- 
-+#
-+# Count also niced process in CPU usage. Default is no.
-+#
-+
-+#NICE=yes
-+
- ################################################
- # DISK OPTIONS
- # (disabled by default)
-@@ -51,4 +57,14 @@
- # DISKS=/dev/hda,/dev/hdb
- 
- 
-+################################################
-+# Special Startup Options
-+# (you shouldn't need to change these)
-+################################################
-+# cpufreq sources for 2.4 kernels
-+CPUFREQ_24="/proc/cpufreq"
-+# cpufreq sources for 2.5/2.6 kernels
-+CPUFREQ_25="/sys/devices/system/cpu/cpu0/cpufreq /sysfs/devices/system/cpu/cpu0/cpufreq"
-+# pure acpi cpufreq
-+CPUFREQ_ACPI="/proc/acpi/processor/CPU0/throttling"

diff --git a/sys-power/cpudyn/files/cpudyn.init b/sys-power/cpudyn/files/cpudyn.init
deleted file mode 100644
index c0f3cebc5aa..00000000000
--- a/sys-power/cpudyn/files/cpudyn.init
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# Based on the Debian init script written by Celso Gonzalez <celso@bulma.net>,
-# and on the cpufreqd Gentoo init script written by Robert Gogolok <robertgogolok@web.de>.
-# Heavily modified by Robin H. Johnson <robbat2@gentoo.org> to ensure correct
-# start only under support conditions
-# More preconditions by Karl Trygve Kalleberg <karltk@gentoo.org> 
-# 
-
-DAEMON=/usr/sbin/cpudynd
-PIDFILE=/var/run/cpudynd.pid
-
-opts="${opts} min max dynamic"
-
-depend() {
-	need localmount
-}
-
-checkconfig() {
-	local CPUFREQ_FILES="${CPUFREQ_24} ${CPUFREQ_25} ${CPUFREQ_ACPI}"
-	local CPUFREQ_FILE=""
-	for i in ${CPUFREQ_FILES}; do [ -e ${i} ] && CPUFREQ_FILE="${i}" && break ; done
-	if [ -z "${CPUFREQ_FILE}" ]; then
-		eerror "Neither CPUFreq nor ACPI throttling support were found"
-		return 1
-	fi
-	if [ "${CPUFREQ_FILE}" = "${CPUFREQ_ACPI}" ]; then
-		# see if the file says we are supported or not
-		grep 'not supported' ${CPUFREQ_ACPI} 2>&1 >/dev/null
-		retval="$?"
-		if [ $retval -eq 0 ]; then
-			eerror "ACPI throttling support found, but hardware doesn't support it"
-			return 1
-		fi
-		# now check that we can write to the file
-		local acpistate=`grep 'active state' ${CPUFREQ_ACPI} | cut -dT -f2-`
-		echo $acpistate > ${CPUFREQ_ACPI}
-		retval="$?"
-		if [ $retval -ne 0 ]; then
-			eerror "Writing to ACPI throttling file failed"
-			return 1
-		fi
-	fi
-	# CPUFREQ_25 has more than one entry, hence the grep -- karltk
-	if [ ! -z "$(echo ${CPUFREQ_25} | grep ${CPUFREQ_FILE})" ]; then
-		# Silently try to load the governors; shouldn't hurt if they're already there
-		modprobe -q cpufreq_performance
-		modprobe -q cpufreq_powersave
-		modprobe -q cpufreq_userspace
-		modprobe -q cpufreq_ondemand
-	fi
-
-	return 0
-}
-
-
-start() {
-	local CPUDYN_OPTS=""
-	if [ -n "$INTERVAL" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -i $INTERVAL"; fi
-	if [ -n "$CPU_UP" -a -n "$CPU_DOWN" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -p $CPU_UP $CPU_DOWN"; fi
-	if [ -n "$THROTTLING_LOW" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -l $THROTTLING_LOW"; fi
-	if [ -n "$TIMEOUT" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -t $TIMEOUT"; fi
-	if [ -n "$DISKS" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -h $DISKS"; fi
-	if [ "$NICE" = "yes" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -nice"; fi
-
-	ebegin "Starting cpudynd"
-	if checkconfig; then
-		start-stop-daemon --start --quiet --pidfile $PIDFILE \
-			--background --make-pidfile --exec $DAEMON -- $CPUDYN_OPTS
-		eend $?
-	else
-		eend 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping cpudynd"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON && rm -f $PIDFILE
-	eend $?
-}
-
-min() {
-	ebegin "Forcing minimal speed"
-	kill -USR2 $(cat ${PIDFILE})
-	eend $?
-}
-max() {
-	ebegin "Forcing maximal speed"
-	kill -USR1 $(cat ${PIDFILE})
-	eend $?
-}
-dynamic() {
-	ebegin "Resetting to default dynamic speed"
-	kill -HUP $(cat ${PIDFILE})
-	eend $?
-}
-
-# vim:ts=4 noexpandtab:

diff --git a/sys-power/cpudyn/metadata.xml b/sys-power/cpudyn/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/sys-power/cpudyn/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-03-13  0:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-29 19:32 [gentoo-commits] repo/gentoo:master commit in: sys-power/cpudyn/files/, sys-power/cpudyn/ Austin English
  -- strict thread matches above, loose matches on Subject: below --
2017-03-13  0:15 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox