Install unit file (#455632)

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 41 insertions, 9 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 3924856db3ab..8c841e1eaa98 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.135 2013/02/19 05:01:56 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.136 2013/07/13 11:25:30 pacho Exp $
+
+  13 Jul 2013; Pacho Ramos <pacho@gentoo.org> +files/fancontrol.service,
+  +files/sensord.service, lm_sensors-3.3.3-r2.ebuild:
+  Install unit file (#455632)
 
   19 Feb 2013; Zac Medico <zmedico@gentoo.org> lm_sensors-3.3.3-r2.ebuild:
   Add ~arm-linux keyword.
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index e812f4f785b2..59fe16a52d2a 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -3,21 +3,23 @@ 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 fancontrol.service 150 SHA256 d07fb50714abfcac5d8aa818d6c40de08221401b554cb21f85dbf2a6cf2eef87 SHA512 e6a738c2458ecffa56d79ab0b187c20a7daebca737bac1a87c82fda5bae24ad4f2a61fd6daeab0a8e5582c404d57372f5eda1a66fe74ccbcb948c114d3e6a0cd WHIRLPOOL 7fb0f1170dbfca825ac245e257e275c58c76adb0bb550434b23d25cf317dffb0319bc9934da6393f279dea85aa6313941b7ff713bfcd9c8e70f36ebcb2c3e7b8
 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 575 SHA256 e75915a13d3c5eb405e2809186a6ab396b2e0180c3efc94e663f9eb4e276e8ef SHA512 5d74973eeb2f1e70deb995bf3579d5d4a2b806ac19a3b9c7b067108939aa34093c11c592b3125a17763ee1ced9c77afe42c1bb11f6f7d57aa3e854fe06a70777 WHIRLPOOL b31020703f4fcd2924452feae5e799b988dc11a9e9960073b4fd2ce16511fb3afa9a686952e72000f424ef2a89b5b3c9f5172acc5929fd499bd6f6f4e68e2ef5
 AUX sensord-conf.d 104 SHA256 02230edf5efbb0a4de3840cd76f9ebf431c57a246fa7388e9dbeb0fe26fe7b8d SHA512 a77d81ab7ded085ba19e4c637e93268f889ccb8ce9e008a210ae135cb6e2140be07e5d455cf7fcc1084fd57cfbfb3f2bb37207123aebe9566f78b5183806fd7d WHIRLPOOL b52a37909dd45c3f7a6a3cab4695e460cf318f05b00faf25aa0717a5caaa1f185b32648711f4842d69e4aa4a062abbf39278fd903b3b07bd8389be73d4777907
+AUX sensord.service 159 SHA256 db38a15de6d311d91f336f708f63e732000731a1f07a5e7d7ac911faf58ddca3 SHA512 c554910a36e44d84f64d5c8924170c3eaccf9715aee2157a37ecf542a1d254c0d9a269555ec3e99165ef7e39874616bc07dddc01c8d708114232df58232c3906 WHIRLPOOL 1cffd3b9a62eba01af22237221980f1cbeb29738e65510532795a39ad9ea7fd72beafd2180a4342164abe9a1f6a1e11048fe3e75b342760add0548dc61e21c14
 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-r2.ebuild 3131 SHA256 c10330bf59142d30add130c7076c39d28ff5a06cdc6226036bab7e0a6822ceb0 SHA512 99f1f687e49faa03592f0f510cfaf4d4cfb3c68f7f77eab001c8de8c100101c201fddd5e2c56e5bccf9083a097c58681998e0b970a8b410e701d9ca561f0e43c WHIRLPOOL 50e53df1c068e1ca930c1f3a699fc3923ea23023002796079b0e5aaa9baf4411df2ae2dea9e54d2014348e5a27bc349803ca23ff0d77f13ff4809c975b952e57
-MISC ChangeLog 16338 SHA256 d50061ba9270b976c0b86a2f361ddfc4290e702a65540b335b619db11765f5ab SHA512 168d76093253523e573b60b29394cd970ce515c50f94934b94876130924ba8c2ef23ad955fecfc44648384f925bbbd72a693139d94c3472644609fad5ab53c07 WHIRLPOOL b87af3291632609412572ada566dea486e93ebcf9e8e92e9c01606ea3705c0ea6d3fdb6ae5af2257c4fb15d046b8b682ee220c8e01fa8c5ba6f6428fc9648bf8
+EBUILD lm_sensors-3.3.3-r2.ebuild 3416 SHA256 0f28812d372b83bbce0d1f945b7a124b046bb2eae8d2a264b9c9f5ef39cf7017 SHA512 4a817a09151783a0ff9ea6856d9e9ffdac0aa76e32af96389b532f5803ccc64a813daab3f8efa14595f5c7fbc8f5ba52bd2c65940e22dc7dd03db317d840a07d WHIRLPOOL 6c8fad9e8da62f1e75c871a3d7d2f13470155cbeeaafa68a801b3b7ae50f3db878989efb3b3194b3d3643daa36d3fb6aa4593b82455365541f4cba0d4ccca5a4
+MISC ChangeLog 16494 SHA256 e19b196d12562eeadbe5594621f9ee6491eeb9b1c235e8d719519dcbcfb23dbf SHA512 b53a7fa7952679afa70b16b22c8fc1732152ddd53c5314358b1d312c18888f6fb083c426d8151e4042fcecc57d6bf66591558a9f096a4cb2fa6962acc9d8cd8b WHIRLPOOL 23a6a53cbcbb800406238e4e225d3fd5b2c41515208b2a1547c5d76a2608572711ac2ef09b281bd1af1a80d831214e0f42d10ab76cb839c30d5237f757dacfa7
 MISC metadata.xml 400 SHA256 190273d72e51490f7d5f52d6ec26bcba691b2c3efb89405da0ea79a9f6aa74c3 SHA512 1d215041e5af31ef57a58656ccaa85d2fe0d16265ff4a30740e2c0c831b60bad1ba328dfd8151ab691479bdc4995eaa964d7c20ddd4a994e8df7e2cfa16654ce WHIRLPOOL b8e495083701023df3759334ace26bd9a28c8421a2e7cc058cee0dfc6f5a1a4ad5b1f2df2700def11756917a2866fbbd480fd0fd6972614eb9e3eb923a92d2a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlEjB0UACgkQ/ejvha5XGaNz6gCfYoItKZQInJBDZfKT4SKR+/eA
-83IAoIGzACLoY6BPKxzAj3181wj0mTv2
-=wYGD
+iEYEAREIAAYFAlHhOSsACgkQCaWpQKGI+9QF6ACghYs/4DNCvEsYgVbMwJx10s7M
+MioAnig6FxeybcLN+EOaf71tIVj12DKB
+=5WYK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lm_sensors/files/fancontrol.service b/sys-apps/lm_sensors/files/fancontrol.service
new file mode 100644
index 000000000000..c86b498f830c
--- /dev/null
+++ b/sys-apps/lm_sensors/files/fancontrol.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Fan control daemon
+
+[Service]
+PIDFile=/var/run/fancontrol.pid
+ExecStart=/usr/sbin/fancontrol
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-apps/lm_sensors/files/sensord.service b/sys-apps/lm_sensors/files/sensord.service
new file mode 100644
index 000000000000..6d272f1efd15
--- /dev/null
+++ b/sys-apps/lm_sensors/files/sensord.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Sensor information logging daemon
+
+[Service]
+PIDFile=/var/run/sensord.pid
+ExecStart=/usr/sbin/sensord
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.3-r2.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.3-r2.ebuild
index a1f72671f61b..9212b2b01d13 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.3.3-r2.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.3.3-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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-r2.ebuild,v 1.2 2013/02/19 05:01:56 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.3-r2.ebuild,v 1.3 2013/07/13 11:25:30 pacho Exp $
 
 EAPI=5
 
-inherit eutils linux-info toolchain-funcs multilib
+inherit eutils linux-info toolchain-funcs multilib systemd
 
 DESCRIPTION="Hardware Monitoring user-space utilities"
 HOMEPAGE="http://www.lm-sensors.org/"
@@ -37,6 +37,10 @@ src_prepare() {
 	# Respect LDFLAGS
 	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
 
+	# Fix shipped unit file paths
+	sed -i -e 's:\(^EnvironmentFile=\).*:\1/etc/conf.d/lm_sensors:' \
+		prog/init/lm_sensors.service || die
+
 	use static-libs || { sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || die; }
 }
 
@@ -59,11 +63,15 @@ src_install() {
 		install
 
 	newinitd "${FILESDIR}"/${PN}-3-init.d ${PN}
+	systemd_dounit prog/init/lm_sensors.service
+
 	newinitd "${FILESDIR}"/fancontrol-init.d-2 fancontrol
+	systemd_dounit "${FILESDIR}"/fancontrol.service
 
 	if use sensord; then
 		newconfd "${FILESDIR}"/sensord-conf.d sensord
 		newinitd "${FILESDIR}"/sensord-4-init.d sensord
+		systemd_dounit "${FILESDIR}"/sensord.service
 	fi
 
 	dodoc CHANGES CONTRIBUTORS INSTALL README \