main/lm-sensors: rename from lm_sensors and upgrade to 3.5.0

rename to lm-sensors to reflect upstream name
remove musl-fix-includes.patch. musl is supported upstream
change source url to github repository where development moved
add provides="lm_sensors" for packages which depends on old name

7 files changed, 9 insertions, 72 deletions

diff --git a/main/lm_sensors/APKBUILD b/main/lm-sensors/APKBUILD
index 18c40213c5..80e235459c 100644
--- a/main/lm_sensors/APKBUILD
+++ b/main/lm-sensors/APKBUILD
@@ -1,10 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lm_sensors
-pkgver=3.4.0
-pkgrel=7
+pkgname=lm-sensors
+pkgver=3.5.0
+pkgrel=0
+_ver=${pkgver//./-}
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring."
 url="https://github.com/lm-sensors/lm-sensors"
 arch="all"
+provides="lm_sensors"
 options="!check"  # No test suite.
 license="LGPL-2.1-or-later AND GPL-2.0-or-later"  # libs are LGPL, binaries are GPL
 depends="bash sysfsutils"
@@ -13,15 +15,13 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-detect $pkgname-sensord
 	$pkgname-sensord-openrc:sensord_openrc"
 #install=sensors.install
 
-# 2015-11-11 (bpiotrowski): upstream website is down, Fedora mirrored the file
-#source="http://dl.lm-sensors.org/lm-sensors/releases/$pkgname-$pkgver.tar.bz2
-source="http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-3.4.0.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-3.4.0.tar.bz2
+source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archive/V$_ver.tar.gz
 	sensors-detect-alpine.patch
-	musl-fix-includes.patch
 	fancontrol.initd
 	sensord.confd
 	sensord.initd
 	"
+builddir="$srcdir"/$pkgname-$_ver
 
 prepare() {
 	cd "$builddir"
@@ -56,7 +56,7 @@ package() {
 
 detect() {
 	depends="perl"
-	pkgdesc="Detection/migration scripts for lm_sensors"
+	pkgdesc="Detection/migration scripts for lm-sensors"
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
 	cd "$pkgdir"
 	mv usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/
@@ -77,9 +77,8 @@ sensord_openrc() {
 	install -Dm755 "$srcdir"/sensord.confd "$subpkgdir"/etc/conf.d/sensord
 }
 
-sha512sums="993064bd14b855c1ae8c057e89313df5b3d5efe441fb2e8c3e508f42bb15658564df2563fac8fabbdb0d650dfdbc694037736c748d45cb9d85dfb8fb5a3d1ea9  lm_sensors-3.4.0.tar.bz2
+sha512sums="bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1  lm-sensors-3.5.0.tar.gz
 794cf2aaa2a9e809c6b67f4c888a89064bba3e5b9333a9f0101a92372c25012e506fa48e86523f57cf30e5c2a808bc38058fd8640c870ea6b48faab44794cfbb  sensors-detect-alpine.patch
-333751cb580c94f2d32ef5520d2f2acc0ef7e1cd4a6390ea75cae4c755fbdfcade1805c979ba3319905f1267bdc120a6746e6f70d89e0c72a8c2faefd34a9e79  musl-fix-includes.patch
 04756c3844033dc7897e1348181140a43f8470c1bb863f1524b21bbe6be2f13fbf17ac3a68270c96a70d8c148124fea569d1ef75619bbe383e15ec705ea18b21  fancontrol.initd
 a77d81ab7ded085ba19e4c637e93268f889ccb8ce9e008a210ae135cb6e2140be07e5d455cf7fcc1084fd57cfbfb3f2bb37207123aebe9566f78b5183806fd7d  sensord.confd
 9a19874c158e82ab076ed5fb96a40d4bfb4957bfd5a2ce66aa207c06e577bc1b048336c0046a9f856f6d00dc10e68a0dc9726f6e726a8f7bfd50c4043ee1e26a  sensord.initd"
diff --git a/main/lm_sensors/fancontrol.initd b/main/lm-sensors/fancontrol.initd
index cb29a9ee93..cb29a9ee93 100644
--- a/main/lm_sensors/fancontrol.initd
+++ b/main/lm-sensors/fancontrol.initd
diff --git a/main/lm_sensors/sensord.confd b/main/lm-sensors/sensord.confd
index d82841aebd..d82841aebd 100644
--- a/main/lm_sensors/sensord.confd
+++ b/main/lm-sensors/sensord.confd
diff --git a/main/lm_sensors/sensord.initd b/main/lm-sensors/sensord.initd
index c100b1aa1e..c100b1aa1e 100644
--- a/main/lm_sensors/sensord.initd
+++ b/main/lm-sensors/sensord.initd
diff --git a/main/lm_sensors/sensors-detect-alpine.patch b/main/lm-sensors/sensors-detect-alpine.patch
index 319fcec069..319fcec069 100644
--- a/main/lm_sensors/sensors-detect-alpine.patch
+++ b/main/lm-sensors/sensors-detect-alpine.patch
diff --git a/main/lm_sensors/sensors.install b/main/lm-sensors/sensors.install
index d593f84144..d593f84144 100644
--- a/main/lm_sensors/sensors.install
+++ b/main/lm-sensors/sensors.install
diff --git a/main/lm_sensors/musl-fix-includes.patch b/main/lm_sensors/musl-fix-includes.patch
deleted file mode 100644
index 501f2dd762..0000000000
--- a/main/lm_sensors/musl-fix-includes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- lm_sensors-3.3.4.orig/prog/dump/isadump.c
-+++ lm_sensors-3.3.4/prog/dump/isadump.c
-@@ -36,13 +36,7 @@
- #include "util.h"
- #include "superio.h"
- 
--
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
---- lm_sensors-3.3.4.orig/prog/dump/isaset.c
-+++ lm_sensors-3.3.4/prog/dump/isaset.c
-@@ -32,13 +32,7 @@
- #include <string.h>
- #include "util.h"
- 
--
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
---- lm_sensors-3.3.4.orig/prog/dump/superio.c
-+++ lm_sensors-3.3.4/prog/dump/superio.c
-@@ -20,12 +20,7 @@
- */
- 
- #include <stdlib.h>
--
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #include "superio.h"
- 
---- lm_sensors-3.3.4.orig/prog/dump/util.c
-+++ lm_sensors-3.3.4/prog/dump/util.c
-@@ -11,12 +11,7 @@
- #include <stdio.h>
- #include "util.h"
- 
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- /* Return 1 if we should continue, 0 if we should abort */
- int user_ack(int def)