Fix init script, fixes bug #216742

Package-Manager: portage-2.1.4.5

4 files changed, 108 insertions, 6 deletions

diff --git a/app-laptop/i8kutils/ChangeLog b/app-laptop/i8kutils/ChangeLog
index 6b921a575ed3..c2243ece657e 100644
--- a/app-laptop/i8kutils/ChangeLog
+++ b/app-laptop/i8kutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/i8kutils
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/ChangeLog,v 1.15 2007/04/21 23:10:58 tester Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/ChangeLog,v 1.16 2008/10/29 20:28:43 tester Exp $
+
+*i8kutils-1.25-r1 (29 Oct 2008)
+
+  29 Oct 2008; Olivier Crête <tester@gentoo.org> +files/i8k.init-r1,
+  +i8kutils-1.25-r1.ebuild:
+  Fix init script, fixes bug #216742
 
   21 Apr 2007; Olivier Crête <tester@gentoo.org> i8kutils-1.25.ebuild:
   Use newconfd/newinitd (bug #174266)
diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index 75091a7e69a6..154850d86133 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 AUX i8k.conf 891 RMD160 0331ff37c0c083315d91e459247399c096adc695 SHA1 b532f1ab9719bd0a6cdfb03cacbce1b478001f93 SHA256 7e867dd900bcf393326d350017b29980452b38a30a1cd4581b786091b4571bca
 AUX i8k.init 1161 RMD160 b7bb1c1a4d1bddd562df09cdac64c4c427dda419 SHA1 8a0d094264b6e63ec6bf26b8636f8875da22ea4b SHA256 67c4114d6f6ac5cf8c4bfb10a65e523ef54119b58b61f44dcd893eb2c5cc2153
+AUX i8k.init-r1 1215 RMD160 107bd00f11558e6450851c205bba0626402216fd SHA1 3ec4db22d1dc2d9ee96f5f05603d67a956fcd74d SHA256 78b572be1fff67fadea425ce250ddb4e0ea577be00d825ca465aba8ea4c7c3e5
 DIST i8kutils_1.25.tar.gz 40528 RMD160 45a45afb2c5528b30864226a5f29c3af2824107f SHA1 f75b117e67242ded9b2936add0e947b6b6dbd976 SHA256 30bd138f31e3632e35472c012732a74c7dac5a87708fd7b24f323a0ca7c71ca4
+EBUILD i8kutils-1.25-r1.ebuild 1039 RMD160 8cd1f2c1663f3e0936fdeec4a30da71bc6cdae4f SHA1 0efc2d416b13eed30b012cfe1ca43813a61f4bb1 SHA256 cb9d7ac81fb7bb676803c542561879272e14da826b8b76f110cad4cc046e78ca
 EBUILD i8kutils-1.25.ebuild 1035 RMD160 3f4cefc87555f5c15a5089f2ee28d794087ff1f8 SHA1 b085506054ba5c16f2dcb3927f63534f0c3f04c2 SHA256 ca9ab7409056486304b631e9d6281a291248d48c91b94de920c928505122a397
-MISC ChangeLog 2260 RMD160 d50f9ff4b1098537913f1f845167955a36a452a3 SHA1 78a7b37d6d99084cecfbddc6bed3e3b726ed5c58 SHA256 2e4ba2d28558c3e88cc5fae0a272d3bf2f5a2474a8255ca51f7f3e1430cdb4dc
+MISC ChangeLog 2429 RMD160 6638b1f4ed79af020afb62caf3586140bc54a42a SHA1 35c835b8a0908ddf8cc9e36516b9f93096098c42 SHA256 87e8b85f07bd96f1c8ef184f0cb2a7f0eabd8c58004514943de0e1e145c0f6ba
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkH4B0ACgkQ+IXOQtHLm/hGMACfT7MGwdKYuV6f4l+guGQJUcux
-8sIAnA1/I/YNtfaDUS6BbzkKsOMVwRot
-=3jmU
+iEYEARECAAYFAkkIxs4ACgkQ+IXOQtHLm/g/7QCginFjpG3L3zzHIYku1FxKrhyO
+yOcAn2Mp27BgXLZMRBZTOdLrzpD3b+QV
+=DN+r
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/i8kutils/files/i8k.init-r1 b/app-laptop/i8kutils/files/i8k.init-r1
new file mode 100644
index 000000000000..21211b0538b7
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8k.init-r1
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+
+depend() {
+	after alsasound
+	after modules
+}
+
+checkconfig() {
+	if [ ! -e /proc/i8k ] ; then
+		eerror "The i8k driver is not installed"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	if [ -n "$VOLUME_UP$VOLUME_DOWN$VOLUME_MUTE" ] ; then
+		ebegin "Starting i8kbuttons"
+		start-stop-daemon --start --quiet --pidfile /var/run/i8kbuttons.pid \
+			--make-pidfile --exec /usr/bin/i8kbuttons --background \
+			-- ${VOLUME_UP:+-u "${VOLUME_UP}"} \
+			   ${VOLUME_DOWN:+-d "$VOLUME_DOWN"} \
+			   ${VOLUME_MUTE:+-m "$VOLUME_MUTE"} \
+			   ${BUTTON_REPEAT:+-r "$BUTTON_REPEAT"}
+		eend $?
+	fi
+	if [ ! -n "$NOMON" ]; then
+		ebegin "Starting i8kmon"
+		start-stop-daemon --start -b --quiet  \
+			--pidfile /var/run/i8kmon.pid \
+			--make-pidfile \
+			--exec /usr/bin/i8kmon --background \
+			--name "tclsh /usr/bin/i8kmon" \
+			-- -d ${NOAUTO:+-na} ${TIMEOUT:+-t $TIMEOUT}
+		eend $?
+	fi
+}
+
+stop() {
+	if [ -n "$VOLUME_UP$VOLUME_DOWN$VOLUME_MUTE" ] ; then
+		ebegin "Stopping i8kbuttons"
+		start-stop-daemon --stop --quiet --pidfile /var/run/i8kbuttons.pid
+		eend $?
+	fi
+	if [ ! -n "$NOMON" ]; then
+		ebegin "Stopping i8kmon"
+		start-stop-daemon --stop --quiet --pidfile /var/run/i8kmon.pid
+		eend $?
+	fi
+}
diff --git a/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild b/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild
new file mode 100644
index 000000000000..dad2cbb960d3
--- /dev/null
+++ b/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild,v 1.1 2008/10/29 20:28:43 tester Exp $
+
+DESCRIPTION="Dell Inspiron and Latitude utilities"
+HOMEPAGE="http://people.debian.org/~dz/i8k/"
+SRC_URI="http://people.debian.org/~dz/i8k/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="tk"
+
+DEPEND="virtual/libc
+	tk? ( >=dev-lang/tk-8.3.3 )"
+
+src_compile() {
+	make all || die
+}
+
+src_install() {
+	dobin i8kbuttons i8kctl
+	doman i8kbuttons.1 i8kctl.1
+	dosym /usr/bin/i8kctl /usr/bin/i8kfan
+	dodoc README.i8kutils
+	docinto examples/
+	dodoc examples/*
+
+	newinitd ${FILESDIR}/i8k.init-r1 i8k
+	newconfd ${FILESDIR}/i8k.conf i8k
+
+	if use tk
+	then
+		dobin i8kmon
+		doman i8kmon.1
+		docinto /
+		dodoc i8kmon.conf
+	else
+		echo >> ${D}/etc/conf.d/i8k
+		echo '# i8kmon disabled because the package was installed without USE=tk' >> ${D}/etc/conf.d/i8k
+		echo 'NOMON=1' >> ${D}/etc/conf.d/i8k
+	fi
+
+}