gentoo resync : 08.01.2021

5 files changed, 40 insertions, 55 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 03b3434228d6..8d0aef73b278 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/oww/Manifest b/sci-misc/oww/Manifest
index 39ff17df2cda..3df904030731 100644
--- a/sci-misc/oww/Manifest
+++ b/sci-misc/oww/Manifest
@@ -1,7 +1,6 @@
 AUX oww-0.86.4-build.patch 1953 BLAKE2B d53cbee2a83367f5c65ff0e05654c86a93e7a1252bb22cb4a724b6671e3d235e58554ca3d8afa4b3a1d5ae5a2773a6a2ed2b4aa1932c897477e2bd0605f5d1f2 SHA512 596ae53c671f8cd94a20c1867fbf03ba06955d660d3c642b9ef6a8c825422e29c0162e4280925135c172b56329934caabd6ff4f4dcf0f8f0238ab0eae0a4f8e9
 AUX oww-0.86.5-format-security.patch 869 BLAKE2B bf523c42991c1cbef4f039f85d05d84d7d7eef9705dcbc10d7fda50aef28ad8ff29b768cea4523ac44889531b6220c0fe5018845e9c35d3b50953cc9d83bb128 SHA512 fadfa26d67320519df3288d85ee335b0080760204735aa0a7c493bcbeebd1bfe676f211e9edb64173a1fc96df308caafed82bd3e8652ab35f2637a8edd489e6b
-DIST oww-0.86.4.tar.gz 927032 BLAKE2B c8874d7ed8448a4e0a589c02936a0dc1e19121cc093f746ff2e74ce27fb05ea31ef82f1136ac5bfeb203bbdaf02497f8fd51f6934505ced039fad47b65b4fcdb SHA512 b97ddd164fe81848e87466992414c8382a0f681bd8f1e16fc51a43facb73f073eb6b0c1da858f4d2d1ffc09273b05b6c3b526a1ccf1d572dbbfd3bfcd0742e05
+AUX oww-0.86.5-musl.patch 562 BLAKE2B b491de13ac982623c812879ceb06c7528766e3683224eaba87eca5a48c30e225dc06245d01a07e804d2c7053b7deb626f3d4d770a2c752434c2731e8481fef8a SHA512 5c8d3f9bfe4a271c234aa94e43d3ca4ee642dbac20005dc12fc79c29c10519a7a8489f67bf36766786e3c0f592e05caa5e9a188d4c34b799e134114f85bb655d
 DIST oww-0.86.5.tar.gz 926962 BLAKE2B 2309dc36f6ced4b131672d231079612e687a37df3529d93c9ef6d350e6d140138f87536dc4eeace290959466a6c2ee555287f8c07f4e4ca75e9643967dea9afa SHA512 cc787379790367eea02423f5213a8947de906d6ccdebb1b76e97196e0be9d9f86e77fbc402693588ae4d7db69968caa7bc9e97e8dfc9395bf420d9df51b28ba9
-EBUILD oww-0.86.4.ebuild 692 BLAKE2B 6e4c72916c6834716efcb3f2ccd21d950748583c65fc43fca2a8d35228da113a0490bb886c9d34e3f2540bb56c3b238a322a6066ef7caecf73afbebf4f6997d1 SHA512 68d181a634fcfe09cda4cf3a636914ffb5fd0165543ec279dfc153fa9a82ea1eb35ea268aadd107760a2973b8cdd5474fac4cae055eb7d2b0a6514508dad6900
-EBUILD oww-0.86.5.ebuild 742 BLAKE2B d4c59689382ab21cf64884d6bba0fe1c057eadb7e72833c7ef233c84999f698700010796e0255d62a746cb6dc5cf4e958360d0504115cfb7f02a6ee9e2a0f760 SHA512 d96f9c7fea0ce26885e1920d439cabfa07d6550751038933cd152c66c14fd7c31fee5096d47ae3cf5e9f3e348765611e76d37dcdfc99671cbdf6a85ff8e29a24
+EBUILD oww-0.86.5.ebuild 775 BLAKE2B 1d7bafaac3e0e1cf2b15433c26cb9192e0303752708fe8589021437ecdb8ef78f64ce91de3cb22ae41207cd12b1f7dd91e26fd7764e855580bb879fed9e2709d SHA512 4565112a25ab87dfea56e10f6225d1399862e63114ef532fa4ca6109dcc119cdcbb573073395614e01f3d867bb21775d2e60de39306d4286a027582727fed5f6
 MISC metadata.xml 336 BLAKE2B 4e8399e6b00c2ff55d1da9d4e00b3f990c4bceefff49196b2fe7966a035ef76dcd1fec09fd5f0402da6968d0c73ad75eae313e2cd26c5924169e229f53019ce0 SHA512 f65457a50fabeaf211324929431dac282d836873b8d918abe567d6a6d657555dbb89bb34d595569f6897d5ec8d5084d5689cc359c8aef9b6564f113f69194c5a
diff --git a/sci-misc/oww/files/oww-0.86.5-musl.patch b/sci-misc/oww/files/oww-0.86.5-musl.patch
new file mode 100644
index 000000000000..2d863a53164b
--- /dev/null
+++ b/sci-misc/oww/files/oww-0.86.5-musl.patch
@@ -0,0 +1,20 @@
+--- a/src/applctn.h
++++ b/src/applctn.h
+@@ -1,3 +1,5 @@
++#include <stdint.h>
++
+ void applctn_pre_init(int *argc, char ***argv) ;
+ void applctn_init(int *argc, char ***argv) ;
+ int applctn_startup_finished(void) ; /* Function to call in state_startup */
+--- a/src/ownet.h
++++ b/src/ownet.h
+@@ -42,9 +42,7 @@
+ //--------------------------------------------------------------//
+ #include <stdlib.h>
+ #include <stdio.h>
+-#ifdef __FreeBSD__
+ #include <sys/types.h>
+-#endif
+ //#include <windows.h>
+ 
+ //--------------------------------------------------------------//
diff --git a/sci-misc/oww/oww-0.86.4.ebuild b/sci-misc/oww/oww-0.86.4.ebuild
deleted file mode 100644
index 37fca19f1314..000000000000
--- a/sci-misc/oww/oww-0.86.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="A one-wire weather station for Dallas Semiconductor"
-HOMEPAGE="http://oww.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls usb"
-
-RDEPEND="
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	)
-
-src_configure() {
-	local myeconfargs=(
-		--enable-interactive
-		$(use_enable nls)
-		$(use_enable gtk gui)
-		$(use_with usb)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-misc/oww/oww-0.86.5.ebuild b/sci-misc/oww/oww-0.86.5.ebuild
index 83eafaaa6ac2..f274c467b343 100644
--- a/sci-misc/oww/oww-0.86.5.ebuild
+++ b/sci-misc/oww/oww-0.86.5.ebuild
@@ -1,38 +1,41 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="A one-wire weather station for Dallas Semiconductor"
 HOMEPAGE="http://oww.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk nls usb"
 
 RDEPEND="
 	net-misc/curl
 	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.86.4-build.patch
 	"${FILESDIR}"/${P}-format-security.patch
-	)
+	"${FILESDIR}"/${P}-musl.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
 
 src_configure() {
-	local myeconfargs=(
-		--enable-interactive
-		$(use_enable nls)
-		$(use_enable gtk gui)
+	econf \
+		--enable-interactive \
+		$(use_enable nls) \
+		$(use_enable gtk gui) \
 		$(use_with usb)
-	)
-	autotools-utils_src_configure
 }