gentoo resync : 02.08.2019

4 files changed, 14 insertions, 25 deletions

diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 1083168724bd..e9f4f7062ccd 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -3,12 +3,12 @@ AUX hddtemp-0.3_beta15-dontwake.patch 515 BLAKE2B 56061289e8d247a11a3172eebf3ed7
 AUX hddtemp-0.3_beta15-iconv.patch 780 BLAKE2B 568a920c7f43a53031212cf059148e618235292fdf6de157b4a3440a06e03c2be66f4e90c72d87da7ffd122fea4a0f37df56a8465966e58e8b142fa61c86e633 SHA512 53f988655d59dff675bb5a103b5688b1d564032350eb915c364e5aabd562d643e6fc9a9eb6bececba886d50b07162fb36d78702e1378f6cdb4a3f67f57209dce
 AUX hddtemp-0.3_beta15-nls.patch 414 BLAKE2B e488ab41496786676920b946e9aab4cf40c959f9799238da65586d0f3391060650ab2aca93b634519404b15279469579a573834e54bbcf170edb9c8284a72a15 SHA512 bbed2015e4a1ff44f0daa5591502d15cb02b9f3e7da8ab490d1ce761db823855c12d2889d9a5abf3924aecb522f9f27167e798ace3147c85ab50983457a480a6
 AUX hddtemp-conf.d 304 BLAKE2B 76c717b744b0539c74bf2e8d0423a0b85c43156d34c170dd69442e5b7f5b800a27324ab556f41077eb5240adba21f42522061e57483796743edfecf2bf315172 SHA512 b82d4be9edceac534bdb953b9ae5b49f4eb717fad8de8847bf43678451361438397b98280c291c638f93dc7d3b4dbb9d7cfae9c8263be007f908eaf6473b198d
-AUX hddtemp-init 434 BLAKE2B d7ae9e8dc490d7ba49725567926d34b1f22688e20a3df169db5e271367638ff382cf60ed58df0752639823477e3f2929758f9b90cd96db751dd57414f4b9b74b SHA512 cb08834efd0e8f1a69bb07d7eb8ae75997072c0c1c04ac4ef1f10d561a29b56593efe52a30346b2fd88e0a50baa791c2a10655415a1ce97afd50a39effbaed64
+AUX hddtemp-init-r1 252 BLAKE2B efbd2da8d0f6125582ab388f0fde87a37ef8d3f6ac781ace2c9f0c23ba6010fda2686b831593c930cb3957e88348b031577082193c9fce8b0080ceae4d6a82b0 SHA512 4d09b626fe2994f90fd3a99a5cfea974759ce7b8c02234b83623e94a275766d3df172aee37ce2be5775c48b8dd8cd99b5cf8700d244bca7db173e7e661ee32b9
 AUX hddtemp.service-r1 214 BLAKE2B 201eeeb152e80c9f5579f5e52e475f061bfe587e2025d6e2824a3118d079089e56b34ed2895e7a1d0db8f21158409dd7247408368a2c1684e6657412abce6e10 SHA512 2218864bead8a0cc0f99d5125940f397fc1396d2e3f7afaf276c3bae0d6c2b2d23ebc51d3a93d3a492d055c8dcdaf44c56ed289d0343b9e264de48971d9153fd
 AUX hddtemp.service.conf 88 BLAKE2B 310463288da0fdee89d914c70aed0175b62d53a382851b9f65702c1137cbeb803a80f5d186a2d0a81ec3dd94fe9733501b28399647fdc864db1f11ab12f21b71 SHA512 dac10db31111623f20580d36b49f2d9b292df39991a4b2590085c08b7a8dbda3903d5dc268d328a71c0bd8d02e781949ab2abde243ae35da8f79bef21aa3fae3
 AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70438914d3c770b75f5b4912ddb17dff0555d9847b43d1e43b19a5a54598778b97bfb4c6829f7424f09f SHA512 7d923d582da2e8012de4ebb4243a4fccd6135cfca7d06f02f50b290c5984af288942f7588da7c8c57b91e362a8febc76f14b489798af14f66e3ec7bec9518ba4
 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
-EBUILD hddtemp-0.3_beta15-r28.ebuild 2709 BLAKE2B ebbb144c74db3e8949572e47099997424fdcee172cf008ae115681a9ffeebc632a106cc827dd0c3556fb5c7c637dde66e32b735a0705553613088f7fd077263c SHA512 1da0ab1e855b471c5b461258985b579cb33cc47ad8f5697c781fd0bbc3875180115c562adeb8a86b5d8fc82eca01da9cf4cc1a0e54365be3ae51ce27c245641c
+EBUILD hddtemp-0.3_beta15-r28.ebuild 2712 BLAKE2B 3b6511cca80f057c0cd686ff7ecd55cb24e3e4528759693706d3e30d78161af64f9f16c488dd68dd23ea831dd6223b2cffe6c6d000f29676dbe3fcdfb2fa8f16 SHA512 b1e93db75db755060271cc0b3c0d725fb4500df80c903fb9ca0bce6f640e223aff42e26774c780baf802850f4ff8eff4fca690a2fbbc159b9cd980f05717a8f9
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
deleted file mode 100644
index 39a640997cfe..000000000000
--- a/app-admin/hddtemp/files/hddtemp-init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting hddtemp daemon"
-	/sbin/start-stop-daemon --start --quiet --exec ${HDDTEMP_EXEC} \
-	-- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping hddtemp daemon"
-	start-stop-daemon --stop --quiet --exec ${HDDTEMP_EXEC}
-	eend $?
-}
-
-
diff --git a/app-admin/hddtemp/files/hddtemp-init-r1 b/app-admin/hddtemp/files/hddtemp-init-r1
new file mode 100644
index 000000000000..00d09ac2c610
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-init-r1
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="${HDDTEMP_EXEC}"
+command_args="-d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}"
+procname="hddtemp"
+
+depend() {
+	need localmount
+}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
index c1ffdee13a6c..293c78379cae 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
@@ -70,7 +70,7 @@ src_install() {
 
 	update_db "${ED}/usr/share/hddtemp/hddgentoo.db" "${ED}/usr/share/hddtemp/hddtemp.db"
 	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-	newinitd "${FILESDIR}"/hddtemp-init hddtemp
+	newinitd "${FILESDIR}"/hddtemp-init-r1 hddtemp
 	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
 	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf