Update init scripts to use the new short form.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

5 files changed, 174 insertions, 2 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 0f9ac6456bae..be526c83f81c 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.131 2012/11/29 14:35:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.132 2012/12/28 00:00:03 flameeyes Exp $
+
+*lm_sensors-3.3.3-r1 (28 Dec 2012)
+
+  28 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/fancontrol-init.d-2, +files/sensord-4-init.d,
+  +lm_sensors-3.3.3-r1.ebuild:
+  Update init scripts to use the new short form.
 
 *lm_sensors-3.3.3 (29 Nov 2012)
 
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index a4638aa870b2..11d2a2ee4067 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -1,11 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fancontrol-init.d 726 SHA256 b231b76d5b32bb303a8e42727f48a4405cec71eedfe392e837acba5e46532783 SHA512 e74d23ed78e066b903eb73e82ab9125bbaf81d86608fb0695314be20e06b777972547889fcfdf8271bcfd53b76a6a9db295f614ce7b73ea31b4d589009a5eb90 WHIRLPOOL a907d23f0d2d2ff636d40acda37956dc4854f08aa5a232a339a2fe83a1f657bce347bd79d23822205ea8603a16aac33f996d3607f826cdaf034c5c4f6047d9ec
+AUX fancontrol-init.d-2 560 SHA256 36d489296c31736f8015b0ce27052b3f1555b7fe6335120c0477b044b8e4fb8d SHA512 95f54da52993a9a39f3cc80caeac0e60ba11f158692df773564e981810e01371703fa50995388978edf08d122df64cffcbfd82a36e0cd61f76e8a9e7b11f23a8 WHIRLPOOL d6af2f05dec9418965695328f6ffd0a700126dcf885e92317bfc78743a5d885f27e2c65f7339a5e66c1cb77522bfc3c176285c4643af443b167fe45aeab8df43
 AUX lm_sensors-3-init.d 2466 SHA256 9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3 SHA512 16b3c7f742c70abcd310928be32fc63b0d344447776bc380be20f8708fbb72bc9b07ddec5ad867cfdc44247474aea3ff5d4f8b405cab896c07791a7a1834db7f WHIRLPOOL 3a090000cc486389a8630f3d88df486cd63458710d1cfb05b8dc545a758fee646698854fd6a13d23b9ff78265ed04aa79c0119acd4a9355fcb51847f2f095b0d
 AUX lm_sensors-3.3.1-sensors-detect-gentoo.patch 4906 SHA256 39f8674e526aa837493a5009b7465f7c8f04784c5990de8a6b8c885c5d8b44a7 SHA512 3d502f1271e06e74ef290efe7d634a55e5b1e017111c409fc26233416d9680e1a102ee1ba68986ca37f787a27d3e3325ba22ceb46e28d3a0d074dc92608f25f2 WHIRLPOOL 7df804767d16890b4420810b6e50797f0dbff4f525de6c41a5ec36e73319a44b5cff4f997a3dbe18e34835dfe3e07a7b8a296aa41f0c46a84c797fe8bcd0c909
 AUX sensord-3-init.d 712 SHA256 8a3debf0b84af9944a467e377b0e4b0db67d428083675f0fcf33ec55a8b2a709 SHA512 d442053fce522f4133eb38220b7acd7bcf626fd00297eaa42ab191568bd9cd3b3592831269e5e73a6dd9885c64f7dd8745b542cee321a5daf21ecb189192d452 WHIRLPOOL dc48de372d732e9b883f5db1e06159b6d6df72c2f4ad92cae6290ee352b7f531bb2e3a94b3425bcd9400a58f8549f094948b2b3c930c80b7d4f9e181cc0be2df
+AUX sensord-4-init.d 559 SHA256 90ae7d54fbd6e69c0ee3d35d47dda7fb740fac35c627426371d903255e8bfeeb SHA512 eb7395230dca57b74817b4a7a687067b31a81a12476aeaaf85b1c57760109c2545de1a2b7384aa9cb2173213d686a11967eef0fe8e4bb9eeb7ad6b66d3203372 WHIRLPOOL 80aa1b830abcb175ca6a8e380a7e9de7c4820b8cad0d064094667dda11787b6307b01318c1ede2b05fce8cf806f1c9702848fb193bd61faf3a76dbb7e6e496c5
 AUX sensord-conf.d 104 SHA256 02230edf5efbb0a4de3840cd76f9ebf431c57a246fa7388e9dbeb0fe26fe7b8d SHA512 a77d81ab7ded085ba19e4c637e93268f889ccb8ce9e008a210ae135cb6e2140be07e5d455cf7fcc1084fd57cfbfb3f2bb37207123aebe9566f78b5183806fd7d WHIRLPOOL b52a37909dd45c3f7a6a3cab4695e460cf318f05b00faf25aa0717a5caaa1f185b32648711f4842d69e4aa4a062abbf39278fd903b3b07bd8389be73d4777907
 DIST lm_sensors-3.3.1.tar.bz2 170156 SHA256 cfcc783945f7bfd5206e73f8f9d3f353b0dbf22153c0ef2587a8d7a7be7e628f SHA512 7ac328104613738409aa63881a42f86a97059cfaf48ccf0c2b21861b80813e64ce4dd5abe3359d1836462f6b6113814162c35740f2cd6e6ada9ec25b68faa579 WHIRLPOOL 9ee1d2e4ec121439b4262db6f2e17ec357570f7ffc39ab8575e1ab43153e5392f6fa769ade71ccb815cd1a7e64c3ec1374536b78dd1fbbaf610f557bed355ac9
 DIST lm_sensors-3.3.3.tar.bz2 172467 SHA256 ecc91ba3d918e96fb7d5eb9acce978af803b130e0b33b08d5ea05b2bfca84955 SHA512 22996d4ded0df4302aa35b78dfbffe35ac27ceb72a23ca14d2ca83a41a5f7a1cf01a5e42dafa6cba91da81d27ddcdf14a7b4a41deebcd64f75c26bb6c35848c5 WHIRLPOOL b109ba91839c411f1a5d5e784b162b1c7da31768e366d55810e0574bae2e19fe106db46c994bc571fcab2900aa50a4ed5eba0dee40f7e2158a74c5dac69340cd
 EBUILD lm_sensors-3.3.1.ebuild 3221 SHA256 cd4fc8f20f7cd7f20ff31e87a1a8aa568da7f3288034a7f838fb97b599ef524a SHA512 4d2cc6bc64fce605a40c3f15a66982bb4d83cfa4e11e9f389213b2bd76f4cd8192c875befc5bb01ab997b37f65b63e54eeba6e78bc16f95717f8ce75af35b078 WHIRLPOOL ff7c7369b9f9dac4ef1e7fa10d0d58381e25ddf0188f6db28c2010b8d6f3c3334d29ed7792792f84b6a320e5fcec7bc496dc95f3fb85df60259862c7dbd508cf
+EBUILD lm_sensors-3.3.3-r1.ebuild 3120 SHA256 70bd6b68936e383c2c1f31b2882e05c7f1a36f4975f103bc7650b1fff883225d SHA512 e363e99c17c7e112452c9befbb8e55547d254b63c553da21e45da906aadcc005e14fca578eb1a2ac6eeecd192f77b8f50e7161a5a13709e27adef1d2d0820a1d WHIRLPOOL 5e926c54fe1237d86745200e972074c3df40eaf9314023aa9372df74624be5614b1cef85494d83ccf757c301efd4e6f05121a16bcceb3335b0044eae2f0b193c
 EBUILD lm_sensors-3.3.3.ebuild 3111 SHA256 963ded7d46352e3c27f52089c4511e1eec8fbd7f66585ae2b9c61fa333174b2f SHA512 fe90cacd1d6e48367517446334a329fef22b7c3112ed6ec9f5eb06d1996c6712b5e9b53c063d899dbd5070c43afa0a20a2f7cb51dabdfd873b3f8fbf84ed0994 WHIRLPOOL 5bfe4a359713088e0f181cda0e2611b41e01d17a1b38fda67015fe6368d77dbbefb8d67123641f0618d8d20c890b42a12f0968cf94e203c89a1f31f889a31969
-MISC ChangeLog 15491 SHA256 b24ffbe6c788e50abbd2de9abc6b5b8452a77d19b482bd2df03201f4d78e67b5 SHA512 d02479ae79bac3bb352debca992263a241e816849503c8e44657e2ad88f351d9481f7fcdfce79b69d5a2eaa652cffac6bd23153d7491acc3d2690a793f028599 WHIRLPOOL 5fa3ffd895da218ae792570e6fa4d7993089617f1132b480ca00322b43d2c40672a50fe920bc58c3c431483687a0aa2e31c1e00ebb086117a4687f1a1e6af1fa
+MISC ChangeLog 15725 SHA256 eb5fe49b76a35ad534ac12e1a580b2995045ff227d9521ad3d2ce55bd3f512d5 SHA512 2eb9dbd2ed7a21f0778061f1d5aa7a8d9815e499207a42be9deac9cd7560d48efad8ebf06a8e28602fe09b2bdd652cd7d3b15d02db4ec13df653e02b42871ae8 WHIRLPOOL 6033ceec30b96564c69d9112658652ceb2670ca3b2c2f77598e404dcb388639d079b0adac4a21f52abb224a97725c9db0467967dd51fefcb1cec279dd82177f6
 MISC metadata.xml 400 SHA256 190273d72e51490f7d5f52d6ec26bcba691b2c3efb89405da0ea79a9f6aa74c3 SHA512 1d215041e5af31ef57a58656ccaa85d2fe0d16265ff4a30740e2c0c831b60bad1ba328dfd8151ab691479bdc4995eaa964d7c20ddd4a994e8df7e2cfa16654ce WHIRLPOOL b8e495083701023df3759334ace26bd9a28c8421a2e7cc058cee0dfc6f5a1a4ad5b1f2df2700def11756917a2866fbbd480fd0fd6972614eb9e3eb923a92d2a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ3OEWAAoJEBzRPIrUMBNCZcYH/20cOnWo1OEKpmFEbMBqwE5B
+loDX7V9owr3UjYD9/Xi6UOiJprAclft8gYIBRHG7KbO9kIQq1BjI828+GtwyukXv
+M1Sxz9J/rnGk7eYzvYwVqNfLG+Q+lCJ4DOkXIzPFMxwo22I4Jkzepc3g+e6vCkjq
+AdcUysRu7oZbtmIQFDrx/Q0aaDvGqEha46ila/CNqh8GH1SW7M2afgsx3OgPar4C
+wdcgCemdC+JgurzD+uIk8dHoLdsVtrYsYX5LooJ7n4fcnFQN0+3as6QUVKaygK2n
+Q3eYyekCX1AzGAmgrO+bqOQLZ5OKKMHl43Fi+PgzqSlQIjqE8X27/su9svcLT88=
+=Nwnv
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lm_sensors/files/fancontrol-init.d-2 b/sys-apps/lm_sensors/files/fancontrol-init.d-2
new file mode 100644
index 000000000000..51857a1f751d
--- /dev/null
+++ b/sys-apps/lm_sensors/files/fancontrol-init.d-2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/fancontrol-init.d-2,v 1.1 2012/12/28 00:00:03 flameeyes Exp $
+
+CONFIG=/etc/fancontrol
+
+depend() {
+	need localmount
+	use lm_sensors
+}
+
+command=/usr/sbin/fancontrol
+command_arguments="${CONFIG}"
+start_stop_daemon_args="--background"
+pidfile=/var/run/fancontrol.pid
+
+start_pre() {
+	if [ ! -f ${CONFIG} ]; then
+		eerror "Configuration file ${CONFIG} not found"
+		return 1
+	fi
+}
diff --git a/sys-apps/lm_sensors/files/sensord-4-init.d b/sys-apps/lm_sensors/files/sensord-4-init.d
new file mode 100644
index 000000000000..9cdbcedc83ae
--- /dev/null
+++ b/sys-apps/lm_sensors/files/sensord-4-init.d
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/sensord-4-init.d,v 1.1 2012/12/28 00:00:03 flameeyes Exp $
+
+CONFIG=/etc/sensors3.conf
+
+depend() {
+	need localmount
+	use logger lm_sensors
+}
+
+command=/usr/sbin/sensorsd
+command_arguments="--config-file ${CONFIG} ${SENSORSD_OPTIONS}"
+pidfile=/var/run/sensorsd.pid
+
+start_pre() {
+	if [ ! -f ${CONFIG} ]; then
+		eerror "Configuration file ${CONFIG} not found"
+		return 1
+	fi
+}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..7037f0825549
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild,v 1.1 2012/12/28 00:00:03 flameeyes Exp $
+
+EAPI=5
+
+inherit eutils linux-info toolchain-funcs multilib
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+HOMEPAGE="http://www.lm-sensors.org/"
+SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="sensord static-libs"
+
+RDEPEND="dev-lang/perl
+	sensord? (
+		net-analyzer/rrdtool
+		virtual/logger
+		)"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
+WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
+WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
+WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.3.1-sensors-detect-gentoo.patch
+
+	use sensord && { sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || die; }
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
+
+	use static-libs || { sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || die; }
+}
+
+src_compile() {
+	einfo
+	einfo "You may safely ignore any errors from compilation"
+	einfo "that contain \"No such file or directory\" references."
+	einfo
+
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		MANDIR="${EPREFIX}/usr/share/man" \
+		ETCDIR="${EPREFIX}/etc" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	newinitd "${FILESDIR}"/${PN}-3-init.d ${PN}
+	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/sensord-conf.d sensord
+		newinitd "${FILESDIR}"/sensord-3-init.d sensord
+	fi
+
+	dodoc CHANGES CONTRIBUTORS INSTALL README \
+		doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid}
+
+	docinto chips
+	dodoc doc/chips/*
+
+	docinto developers
+	dodoc doc/developers/applications
+}
+
+pkg_postinst() {
+	elog
+	elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
+	elog "/etc/conf.d/${PN}."
+	elog
+	elog "/etc/conf.d/${PN} is vital to the init-script."
+	elog "Please make sure you also add ${PN} to the desired"
+	elog "runlevel. Otherwise your I2C modules won't get loaded"
+	elog "on the next startup."
+	elog
+	elog "You will also need to run the above command if you're upgrading from"
+	elog "<=${PN}-2, as the needed entries in /etc/conf.d/${PN} has"
+	elog "changed."
+	elog
+	elog "Be warned, the probing of hardware in your system performed by"
+	elog "sensors-detect could freeze your system. Also make sure you read"
+	elog "the documentation before running ${PN} on IBM ThinkPads."
+	elog
+	elog "Also make sure you have read:"
+	elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"
+	elog
+	elog "Please refer to the ${PN} documentation for more information."
+	elog "(http://www.lm-sensors.org/wiki/Documentation)"
+	elog
+}