commit: d8e0141971af134a48401d57761019e151f7553f Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Oct 3 14:21:10 2017 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Tue Oct 3 14:25:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e01419
sys-apps/lm_sensors: Cleanup old See: https://github.com/gentoo/gentoo/pull/5847 Package-Manager: Portage-2.3.10, Repoman-2.3.3 sys-apps/lm_sensors/Manifest | 3 - sys-apps/lm_sensors/files/fancontrol-init.d-2 | 22 ---- sys-apps/lm_sensors/files/fancontrol.service | 9 -- sys-apps/lm_sensors/files/lm_sensors-3-init.d | 104 ------------------ .../lm_sensors-3.3.4-sensors-detect-gentoo.patch | 118 -------------------- .../lm_sensors-3.3.5-sensors-detect-gentoo.patch | 120 --------------------- sys-apps/lm_sensors/files/sensord-4-init.d | 21 ---- sys-apps/lm_sensors/files/sensord-conf.d | 3 - sys-apps/lm_sensors/files/sensord.service | 9 -- sys-apps/lm_sensors/lm_sensors-3.3.4-r1.ebuild | 108 ------------------- sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild | 108 ------------------- sys-apps/lm_sensors/lm_sensors-3.4.0.ebuild | 108 ------------------- 12 files changed, 733 deletions(-) diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest index c9e6ed72b04..7abb62626fc 100644 --- a/sys-apps/lm_sensors/Manifest +++ b/sys-apps/lm_sensors/Manifest @@ -1,4 +1 @@ -DIST lm_sensors-3.3.4.tar.bz2 172226 SHA256 b4608610cb5de4b24e3fe1ae357712e8633a8a929bbb42df5eecc4ccee6ba76d SHA512 a375f747a1687da0fe743d731893156f7983e001725c2d7cd284cefd3e8922deb3dfe542d3c901e3da8fff321633d64180a637d780b5e1bb3f1e9a254c16b7e6 WHIRLPOOL 4011264a56c36ffcfe28d357ceae1929fdf8a21c27bfaba928c9a7b48ef2b8422cd6650981a4c8f220900cc45526ca4bbfda9810b54db0efaf15cdaad4599838 -DIST lm_sensors-3.3.5.tar.bz2 173609 SHA256 5dae6a665e1150159a93743c4ff1943a7efe02cd9d3bb12c4805e7d7adcf4fcf SHA512 0874084c3dd40b93ed05e1955f76e35e78ac3ac2343341d8ab5412fd941ea300b3a4b1320bec3a5bfb07309e82f42cc5dac0a728cdfddac4053d4fdb96dc12e7 WHIRLPOOL f82d0d1a4b7647cf9076f16861024dd65fd97bd34a7498fcc06e851913f5b71805689d915b67a628b6cd7aea2b46225d64df8833550c785236311c9980ac8ed1 -DIST lm_sensors-3.4.0.tar.bz2 175802 SHA256 e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f SHA512 993064bd14b855c1ae8c057e89313df5b3d5efe441fb2e8c3e508f42bb15658564df2563fac8fabbdb0d650dfdbc694037736c748d45cb9d85dfb8fb5a3d1ea9 WHIRLPOOL 82ed9b922a352702d974ea075222894c69a081da1fca9e026e3176266bb6a8911fd8fc0cd73f2d9ab3524cd30cfe2e688a015032829cf32d844592debaf9924d DIST lm_sensors-3.4.0_p20160725.tar.gz 206868 SHA256 c3bb872cabcf3fa4b597bc1a8d6ee277a80b28c811125a45341e0874a97ac102 SHA512 abae5c4ba2ed0b763fda918e2ededb2148a3edd1d33709a34b91a33398a64e8988d14c5d16a5c756bf55beaa383e661c76e1acccc7b5ef858aa772e96878131b WHIRLPOOL 4d7620f74ea46f559b6b293a7cb20f0296277f7c10f54b368fd63bef2d1496b3769f39066cc4f980337d99b3a1dbb51af8e9eed724605f153a08cfa9fd28739b diff --git a/sys-apps/lm_sensors/files/fancontrol-init.d-2 b/sys-apps/lm_sensors/files/fancontrol-init.d-2 deleted file mode 100644 index ea60db78370..00000000000 --- a/sys-apps/lm_sensors/files/fancontrol-init.d-2 +++ /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 - -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/fancontrol.service b/sys-apps/lm_sensors/files/fancontrol.service deleted file mode 100644 index c86b498f830..00000000000 --- a/sys-apps/lm_sensors/files/fancontrol.service +++ /dev/null @@ -1,9 +0,0 @@ -[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/lm_sensors-3-init.d b/sys-apps/lm_sensors/files/lm_sensors-3-init.d deleted file mode 100644 index 461d1ede93e..00000000000 --- a/sys-apps/lm_sensors/files/lm_sensors-3-init.d +++ /dev/null @@ -1,104 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -checkconfig() { - if [ ! -f /etc/conf.d/lm_sensors ]; then - eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect" - return 1 - fi - - if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then - if [ -z "${MODULE_0}" ]; then - eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect" - return 1 - fi - fi -} - -start() { - checkconfig || return 1 - - if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then - einfo "Loading lm_sensors modules..." - - mount | grep sysfs >/dev/null 2>&1 - if [ ${?} = 0 ]; then - if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then - ebegin " Loading i2c-core" - modprobe i2c-core >/dev/null 2>&1 - if [ ${?} != 0 ]; then - eerror " Could not load i2c-core!" - eend 1 - fi - ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1 - eend 0 - fi - elif ! [ -e /proc/sys/dev/sensors ]; then - ebegin " Loading i2c-proc" - modprobe i2c-proc >/dev/null 2>&1 - if [ ${?} != 0 ]; then - eerror " Could not load i2c-proc!" - eend 1 - fi - [ -e /proc/sys/dev/sensors ] || return 1 - eend 0 - fi - - i=0 - while true; do - module=`eval echo '$'MODULE_${i}` - module_args=`eval echo '$'MODULE_${i}_ARGS` - if [ -z "${module}" ]; then - break - fi - ebegin " Loading ${module}" - modprobe ${module} ${module_args} >/dev/null 2>&1 - eend $? - i=$(($i+1)) - done - fi - - if [ "${INITSENSORS}" = "yes" ]; then - if ! [ -f /etc/sensors3.conf ]; then - eerror "/etc/sensors3.conf does not exist!" - return 1 - fi - - ebegin "Initializing sensors" - /usr/bin/sensors -s >/dev/null 2>&1 - eend ${?} - fi -} - -stop() { - checkconfig || return 1 - - if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then - einfo "Unloading lm_sensors modules..." - - # find the highest possible MODULE_ number - i=0 - while true; do - module=`eval echo '$'MODULE_${i}` - if [ -z "${module}" ] ; then - break - fi - i=$(($i+1)) - done - - while [ ${i} -gt 0 ]; do - i=$(($i-1)) - module=`eval echo '$'MODULE_${i}` - ebegin " Unloading ${module}" - rmmod ${module} >/dev/null 2>&1 - eend $? - done - - if [ -e /proc/sys/dev/sensors ] ; then - ebegin " Unloading i2c-proc" - rmmod i2c-proc >/dev/null 2>&1 - eend $? - fi - fi -} diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch deleted file mode 100644 index 215969af2cb..00000000000 --- a/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index fb17481..bb324c2 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -20,6 +20,9 @@ - # MA 02110-1301 USA. - # - -+# Gentoo specific modifications based on a patch from Rudo Thomas -+# <[email protected]> -+ - require 5.004; - - use strict; -@@ -6671,26 +6674,33 @@ sub write_config - print MODPROBE_D $configfile; - close(MODPROBE_D); - } else { -+ print "\nIf you want to load the modules at startup, generate a config file\n", -+ "below and make sure lm_sensors gets started at boot time; e.g\n", -+ "\$ rc-update add lm_sensors default\n"; - print "To make the sensors modules behave correctly, add these lines to\n". -- "/etc/modprobe.conf:\n\n"; -+ "/etc/modules.d/lm_sensors and run modules-update:\n\n"; - print "#----cut here----\n". - $configfile. - "#----cut here----\n\n"; - } - } - -- my $have_sysconfig = -d '/etc/sysconfig'; -- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", -- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), -- ($have_sysconfig ? 'YES/no' : 'yes/NO'); -- $_ = <STDIN>; -- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) { -- unless ($have_sysconfig) { -- mkdir('/etc/sysconfig', 0777) -- or die "Sorry, can't create /etc/sysconfig ($!)"; -+ my $have_config = -f '/etc/conf.d/lm_sensors'; -+ print "\nDo you want to ".($have_config?"overwrite":"generate"). -+ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n", -+ " (".($have_config?"yes/NO":"YES/no")."/s): "; -+ my $reply = <STDIN>; -+ -+ if (($have_config and $reply =~ /^\s*[Yy]/) or -+ (not $have_config and not $reply =~ /^\s*[Nn]/) or -+ $reply =~ /^\s*[Ss]/) { -+ my $filename = "/etc/conf.d/lm_sensors"; -+ if ($reply =~ /^\s*[Ss]/) { -+ print "Specify the file to store the configuration to: "; -+ $filename = <STDIN>; - } -- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") -- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; -+ open(local *SYSCONFIG, ">".$filename) -+ or die "Sorry, can't create $filename ($!)."; - print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; - print SYSCONFIG <<'EOT'; - # This file is sourced by /etc/init.d/lm_sensors and defines the modules to -@@ -6701,30 +6711,17 @@ sub write_config - # BUS_MODULES for any required bus driver module (for example for I2C or SPI). - - EOT -+ print SYSCONFIG -+ "# Load modules at startup\n". -+ "LOADMODULES=yes\n\n". -+ "# Initialize sensors at startup\n". -+ "INITSENSORS=yes\n\n"; - print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n" - if @{$bus_modules}; - print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n"; - close(SYSCONFIG); - -- if (-x "/bin/systemctl" && -d "/lib/systemd/system" && -- ! -f "/lib/systemd/system/lm_sensors.service") { -- print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n". -- "and run 'systemctl enable lm_sensors.service'\n". -- "for initialization at boot time.\n"; -- return; -- } -- -- if (-x "/bin/systemctl" && -- -f "/lib/systemd/system/lm_sensors.service") { -- system("/bin/systemctl", "enable", "lm_sensors.service"); -- system("/bin/systemctl", "start", "lm_sensors.service"); -- # All done, don't check for /etc/init.d/lm_sensors -- return; -- } -- -- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n". -- "for initialization at boot time.\n" -- unless -f "/etc/init.d/lm_sensors"; -+ print "Done.\n"; - - if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") { - system("/sbin/insserv", "/etc/init.d/lm_sensors"); -@@ -6738,20 +6735,6 @@ EOT - "kernel modules.\n\n"; - } - } else { -- print "To load everything that is needed, add this to one of the system\n". -- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n"; -- print "#----cut here----\n"; -- if (@{$bus_modules}) { -- print "# Adapter drivers\n"; -- print "modprobe $_\n" foreach (@{$bus_modules}); -- } -- print "# Chip drivers\n"; -- print "modprobe $_\n" foreach (@{$hwmon_modules}); -- print((-e '/usr/bin/sensors' ? -- "/usr/bin/sensors -s\n" : -- "/usr/local/bin/sensors -s\n"). -- "#----cut here----\n\n"); -- - print "If you have some drivers built into your kernel, the list above will\n". - "contain too many modules. Skip the appropriate ones! You really\n". - "should try these commands right now to make sure everything is\n". diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch deleted file mode 100644 index 0ea9a02b3f9..00000000000 --- a/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- lm_sensors-3.3.5/prog/detect/sensors-detect -+++ lm_sensors-3.3.5/prog/detect/sensors-detect -@@ -20,6 +20,9 @@ - # MA 02110-1301 USA. - # - -+# Gentoo specific modifications based on a patch from Rudo Thomas -+# <[email protected]> -+ - require 5.004; - - use strict; -@@ -6762,26 +6765,33 @@ - print MODPROBE_D $configfile; - close(MODPROBE_D); - } else { -+ print "\nIf you want to load the modules at startup, generate a config file\n", -+ "below and make sure lm_sensors gets started at boot time; e.g\n", -+ "\$ rc-update add lm_sensors default\n"; - print "To make the sensors modules behave correctly, add these lines to\n". -- "/etc/modprobe.conf:\n\n"; -+ "/etc/modules.d/lm_sensors and run modules-update:\n\n"; - print "#----cut here----\n". - $configfile. - "#----cut here----\n\n"; - } - } - -- my $have_sysconfig = -d '/etc/sysconfig'; -- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", -- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), -- ($have_sysconfig ? 'YES/no' : 'yes/NO'); -- $_ = read_answer(); -- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) { -- unless ($have_sysconfig) { -- mkdir('/etc/sysconfig', 0777) -- or die "Sorry, can't create /etc/sysconfig ($!)"; -+ my $have_sysconfig = -f '/etc/conf.d/lm_sensors'; -+ printf "Do you want to ".($have_sysconfig?"overwrite":"generate"). -+ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n", -+ " (".($have_sysconfig?"yes/NO":"YES/no")."/s): "; -+ my $reply = read_answer(); -+ -+ if (($have_sysconfig and $reply =~ /^\s*[Yy]/) or -+ (not $have_sysconfig and not $reply =~ /^\s*[Nn]/) or -+ $reply =~ /^\s*[Ss]/) { -+ my $filename = "/etc/conf.d/lm_sensors"; -+ if ($reply =~ /^\s*[Ss]/) { -+ print "Specify the file to store the configuration to: "; -+ $filename = read_answer(); - } -- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") -- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; -+ open(local *SYSCONFIG, ">".$filename) -+ or die "Sorry, can't create $filename ($!)."; - print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; - print SYSCONFIG <<'EOT'; - # This file is sourced by /etc/init.d/lm_sensors and defines the modules to -@@ -6792,30 +6802,17 @@ - # BUS_MODULES for any required bus driver module (for example for I2C or SPI). - - EOT -+ print SYSCONFIG -+ "# Load modules at startup\n". -+ "LOADMODULES=yes\n\n". -+ "# Initialize sensors at startup\n". -+ "INITSENSORS=yes\n\n"; - print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n" - if @{$bus_modules}; - print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n"; - close(SYSCONFIG); - -- if (-x "/bin/systemctl" && -d "/lib/systemd/system" && -- ! -f "/lib/systemd/system/lm_sensors.service") { -- print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n". -- "and run 'systemctl enable lm_sensors.service'\n". -- "for initialization at boot time.\n"; -- return; -- } -- -- if (-x "/bin/systemctl" && -- -f "/lib/systemd/system/lm_sensors.service") { -- system("/bin/systemctl", "enable", "lm_sensors.service"); -- system("/bin/systemctl", "start", "lm_sensors.service"); -- # All done, don't check for /etc/init.d/lm_sensors -- return; -- } -- -- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n". -- "for initialization at boot time.\n" -- unless -f "/etc/init.d/lm_sensors"; -+ print "Done.\n"; - - if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") { - system("/sbin/insserv", "/etc/init.d/lm_sensors"); -@@ -6828,24 +6825,6 @@ - print "You should now start the lm_sensors service to load the required\n". - "kernel modules.\n\n"; - } -- } else { -- print "To load everything that is needed, add this to one of the system\n". -- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n"; -- print "#----cut here----\n"; -- if (@{$bus_modules}) { -- print "# Adapter drivers\n"; -- print "modprobe $_\n" foreach (@{$bus_modules}); -- } -- print "# Chip drivers\n"; -- print "modprobe $_\n" foreach (@{$hwmon_modules}); -- print((-e '/usr/bin/sensors' ? -- "/usr/bin/sensors -s\n" : -- "/usr/local/bin/sensors -s\n"). -- "#----cut here----\n\n"); -- -- print "You really should try these commands right now to make sure everything\n". -- "is working properly. Monitoring programs won't work until the needed\n". -- "modules are loaded.\n\n"; - } - } - diff --git a/sys-apps/lm_sensors/files/sensord-4-init.d b/sys-apps/lm_sensors/files/sensord-4-init.d deleted file mode 100644 index beaecbfabf7..00000000000 --- a/sys-apps/lm_sensors/files/sensord-4-init.d +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONFIG=/etc/sensors3.conf - -depend() { - need localmount - use logger lm_sensors -} - -pidfile=/run/sensord.pid -command=/usr/sbin/sensord -command_args="--config-file ${CONFIG} ${SENSORD_OPTIONS} --pid-file ${pidfile}" - -start_pre() { - if [ ! -f ${CONFIG} ]; then - eerror "Configuration file ${CONFIG} not found" - return 1 - fi -} diff --git a/sys-apps/lm_sensors/files/sensord-conf.d b/sys-apps/lm_sensors/files/sensord-conf.d deleted file mode 100644 index d82841aebd4..00000000000 --- a/sys-apps/lm_sensors/files/sensord-conf.d +++ /dev/null @@ -1,3 +0,0 @@ -# Extra options to pass to the sensord daemon, -# see sensord(8) for more information -SENSORD_OPTIONS="" diff --git a/sys-apps/lm_sensors/files/sensord.service b/sys-apps/lm_sensors/files/sensord.service deleted file mode 100644 index 6d272f1efd1..00000000000 --- a/sys-apps/lm_sensors/files/sensord.service +++ /dev/null @@ -1,9 +0,0 @@ -[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.4-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.4-r1.ebuild deleted file mode 100644 index 66fc2741908..00000000000 --- a/sys-apps/lm_sensors/lm_sensors-3.3.4-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils linux-info multilib systemd toolchain-funcs - -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 ppc64 sparc x86 ~amd64-linux ~arm-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}"/${P}-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 - - # 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; } -} - -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} - 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 \ - doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} - - docinto developers - dodoc doc/developers/applications -} - -pkg_postinst() { - echo - elog "Please run \`/usr/sbin/sensors-detect' in order to setup" - elog "/etc/conf.d/${PN}." - echo - 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." - echo - 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." - echo - 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." - echo - elog "Also make sure you have read:" - elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"; - echo - elog "Please refer to the ${PN} documentation for more information." - elog "(http://www.lm-sensors.org/wiki/Documentation)" - echo -} diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild deleted file mode 100644 index 5d6d9242a94..00000000000 --- a/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils linux-info multilib systemd toolchain-funcs - -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 ppc64 sparc x86 ~amd64-linux ~arm-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}"/${P}-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 - - # 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; } -} - -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} - 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 \ - doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} - - docinto developers - dodoc doc/developers/applications -} - -pkg_postinst() { - echo - elog "Please run \`/usr/sbin/sensors-detect' in order to setup" - elog "/etc/conf.d/${PN}." - echo - 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." - echo - 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." - echo - 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." - echo - elog "Also make sure you have read:" - elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"; - echo - elog "Please refer to the ${PN} documentation for more information." - elog "(http://www.lm-sensors.org/wiki/Documentation)" - echo -} diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0.ebuild deleted file mode 100644 index 3f0943216e6..00000000000 --- a/sys-apps/lm_sensors/lm_sensors-3.4.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils linux-info multilib systemd toolchain-funcs - -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 ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-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.5-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 - - # 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; } -} - -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} - 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 \ - doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} - - docinto developers - dodoc doc/developers/applications -} - -pkg_postinst() { - echo - elog "Please run \`/usr/sbin/sensors-detect' in order to setup" - elog "/etc/conf.d/${PN}." - echo - 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." - echo - 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." - echo - 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." - echo - elog "Also make sure you have read:" - elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"; - echo - elog "Please refer to the ${PN} documentation for more information." - elog "(http://www.lm-sensors.org/wiki/Documentation)" - echo -}
