Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/lm_sensors/
Date: Wed, 26 Sep 2018 22:49:34
Message-Id: 1538002156.4b145250c0a24e4bb38fa141111f7f440c4cefbf.whissi@gentoo
1 commit: 4b145250c0a24e4bb38fa141111f7f440c4cefbf
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 26 22:48:20 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 26 22:49:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b145250
7
8 sys-apps/lm_sensors: new snapshot release from 2018-09-23
9
10 Closes: https://bugs.gentoo.org/661566
11 Package-Manager: Portage-2.3.50, Repoman-2.3.11
12
13 sys-apps/lm_sensors/Manifest | 1 +
14 .../lm_sensors/lm_sensors-3.4.0_p20180923.ebuild | 215 +++++++++++++++++++++
15 2 files changed, 216 insertions(+)
16
17 diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
18 index 7e23e18d7a1..2c90a91f7d2 100644
19 --- a/sys-apps/lm_sensors/Manifest
20 +++ b/sys-apps/lm_sensors/Manifest
21 @@ -1,3 +1,4 @@
22 DIST lm_sensors-3.4.0_p20170901.tar.gz 208487 BLAKE2B b6d2eb6efee25891fbd655738ba25e91d8ec5d97f07e24ee217ab1a59c51a8ab59e042a90ed6fa1de4459992adc740252588419c0f74ce02f9ad7c1f4f9750da SHA512 5c4a750efdff2ef086a5ed1b6a8a03278872ca077255eae91d0696af229f37b09216e2f53d1d6e4602596fd8b978e0b9c27327357621486c5d7b1d39ecd16fea
23 DIST lm_sensors-3.4.0_p20180318.tar.gz 260899 BLAKE2B a859c20ef148f80cc9d5ead61547feb5c26a77447aeedf9273334fc1e5b4075c74d8f786102e33e8fc771968dd605829923f8d3da8293fef168c74b8c55bf32a SHA512 923ee985d8e0b8fdc43b2e4418873ccbeb8433adbf2efe71fcaba1df0c6971d502866abe8ea015d199380e06e3cfd35d945451e5e9f7e64cede35fff37621aee
24 DIST lm_sensors-3.4.0_p20180820.tar.gz 261837 BLAKE2B 5b072a71554fa2ae41dd0fa51b66dcf32874579eef51a94d36b95e92b77629fbdf193a281bde3258af60366df38cacec6da67055f9f4766d863d37673f6a5065 SHA512 99ca718ae0e832fab8cbb3a2ab106f5df2fad9e822df99ee24d73758c64853a05c50464081e84335680a44ad93acaa6d4f0ef21291b7f008f24bcaa292d0fdab
25 +DIST lm_sensors-3.4.0_p20180923.tar.gz 264263 BLAKE2B 7444934429b16ae19af0390e8d3e6a2cf979dccf3c83ee8a3fd0f1f358d07bbc3e446197d44deb994a6d3313cff492625b8fd5c7462c39eb5e10b998b6588cb1 SHA512 cf6ea7898248420e2927aa673ba166ede8e774f605038fad4e503f178ab36c2b371253c69197739fe533663dac191b40dce7c3b4ad71488e4f15e4583f6ad363
26
27 diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
28 new file mode 100644
29 index 00000000000..9ab915de11a
30 --- /dev/null
31 +++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
32 @@ -0,0 +1,215 @@
33 +# Copyright 1999-2018 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI="6"
37 +
38 +inherit linux-info systemd toolchain-funcs multilib-minimal eapi7-ver
39 +
40 +DESCRIPTION="Hardware Monitoring user-space utilities"
41 +HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
42 +
43 +COMMIT="807f9b1529892c0ac89bca0c7ae781c59f9c8393"
44 +MY_PN="${PN/_/-}"
45 +
46 +#SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
47 +SRC_URI="https://github.com/lm-sensors/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
48 +
49 +LICENSE="GPL-2+ LGPL-2.1"
50 +
51 +# SUBSLOT based on SONAME of libsensors.so
52 +SLOT="0/4.4.0"
53 +
54 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
55 +IUSE="contrib sensord static-libs"
56 +
57 +COMMON_DEPS="
58 + sensord? (
59 + net-analyzer/rrdtool
60 + virtual/logger
61 + )"
62 +
63 +RDEPEND="${COMMON_DEPS}
64 + dev-lang/perl
65 + !<sys-apps/openrc-0.21.7"
66 +
67 +DEPEND="${COMMON_DEPS}
68 + sys-devel/bison
69 + sys-devel/flex"
70 +
71 +CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
72 +WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
73 +WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
74 +WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
75 +
76 +PATCHES=( "${FILESDIR}"/${PN}-3.4.0-sensors-detect-gentoo.patch )
77 +
78 +DOCS=( CHANGES CONTRIBUTORS INSTALL README )
79 +DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
80 +
81 +S="${WORKDIR}/${MY_PN}-${COMMIT}"
82 +
83 +src_prepare() {
84 + default
85 +
86 + if [[ -n "${COMMIT}" ]]; then
87 + local _version="${PV%_*}+git_${COMMIT}"
88 +
89 + sed -i \
90 + -e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
91 + version.h || \
92 + die "Failed to update version.h"
93 +
94 + sed -i \
95 + -e "s/^\$revision = '.*/\$revision = '${_version}';/" \
96 + -e "/^\$revision =~ s.*/d" \
97 + prog/detect/sensors-detect || \
98 + die "Failed to set revision in prog/detect/sensors-detect"
99 +
100 + sed -i \
101 + -e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
102 + -e "/^REVISION=.*/d" \
103 + -e "/^REVDATE=.*/d" \
104 + -e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
105 + prog/pwm/pwmconfig || \
106 + die "Failed to adjust prog/pwm/pwmconfig"
107 + else
108 + sed -i \
109 + -e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
110 + prog/pwm/pwmconfig || \
111 + die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
112 + fi
113 +
114 + # Respect LDFLAGS
115 + sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
116 + die "Failed to sed in LDFLAGS"
117 +
118 + sed -i \
119 + -e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
120 + prog/pwm/fancontrol || \
121 + die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
122 +
123 + # Don't use EnvironmentFile in systemd unit
124 + sed -i \
125 + -e '/^EnvironmentFile=/d' \
126 + -e '/^Exec.*modprobe.*/d' \
127 + prog/init/lm_sensors.service || \
128 + die "Failed to remove EnvironmentFile from systemd unit file"
129 +
130 + if ! use static-libs; then
131 + sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
132 + die "Failed to disable static building"
133 + fi
134 +
135 + # Don't show outdated user instructions
136 + sed -i -e '/^ @echo "\*\*\* /d' Makefile || \
137 + die "Failed to remove outdated user instructions"
138 +
139 + multilib_copy_sources
140 +}
141 +
142 +multilib_src_configure() {
143 + default
144 +
145 + if multilib_is_native_abi && use sensord; then
146 + # sensord requires net-analyzer/rrdtool which doesn't have real multilib
147 + # support. To prevent errors like
148 + #
149 + # skipping incompatible /usr/lib/librrd.so when searching for -lrrd
150 + # cannot find -lrrd
151 + #
152 + # we only build sensord when we are building for profile's native ABI
153 + # (it doesn't affect libsensors.so).
154 + sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
155 + die "Failed to enable building of sensord"
156 + fi
157 +}
158 +
159 +multilib_src_compile() {
160 + emake \
161 + CC="$(tc-getCC)" \
162 + CXX="$(tc-getCXX)" \
163 + LD="$(tc-getLD)" \
164 + AR="$(tc-getAR)"
165 +}
166 +
167 +multilib_src_install() {
168 + emake \
169 + DESTDIR="${D%/}" \
170 + PREFIX="/usr" \
171 + MANDIR="/usr/share/man" \
172 + ETCDIR="/etc" \
173 + LIBDIR="/usr/$(get_libdir)" \
174 + install
175 +}
176 +
177 +multilib_src_install_all() {
178 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
179 + newconfd "${FILESDIR}"/${PN}.confd ${PN}
180 + systemd_dounit prog/init/lm_sensors.service
181 +
182 + newinitd "${FILESDIR}"/fancontrol.initd fancontrol
183 + newconfd "${FILESDIR}"/fancontrol.confd fancontrol
184 + systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
185 +
186 + if use sensord; then
187 + newconfd "${FILESDIR}"/sensord.confd sensord
188 + newinitd "${FILESDIR}"/sensord.initd sensord
189 + systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
190 + fi
191 +
192 + einstalldocs
193 +
194 + docinto developers
195 + dodoc doc/developers/applications
196 +
197 + if use contrib; then
198 + insinto /usr/share/${PN}
199 + doins -r "${S}"/configs
200 + fi
201 +}
202 +
203 +pkg_postinst() {
204 + local _new_loader='3.4.0_p20160725'
205 + local _v
206 + for _v in ${REPLACING_VERSIONS}; do
207 + if ! ver_test "${_v}" -gt "${_new_loader}"; then
208 + # This is an upgrade which require migration
209 +
210 + elog ""
211 + elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
212 + elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
213 + elog ""
214 + elog "To migrate your configuration you have 2 options:"
215 + elog ""
216 + elog " a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
217 + elog ""
218 + elog " b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
219 + elog " variables from \"/etc/conf.d/lm_modules\" to"
220 + elog " \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
221 + elog ""
222 + elog " For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
223 + elog ""
224 + elog " Important: Don't forget to migrate your module's argument"
225 + elog " (modules_<name>_args variable) if your are not already"
226 + elog " using \"/etc/modprobe.d\" (which is recommended)."
227 +
228 + # Show this elog only once
229 + break
230 + fi
231 + done
232 +
233 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
234 + # New installation
235 +
236 + elog ""
237 + elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
238 + elog "\"/etc/modules-load.d/lm_sensors.conf\"."
239 + elog ""
240 + elog "You might want to add ${PN} to your default runlevel to make"
241 + elog "sure the sensors get initialized on the next startup."
242 + elog ""
243 + elog "Be warned, the probing of hardware in your system performed by"
244 + elog "sensors-detect could freeze your system. Also make sure you read"
245 + elog "the documentation before running ${PN} on IBM ThinkPads."
246 + fi
247 +}