gentoo resync : 20.03.2022

4 files changed, 115 insertions, 73 deletions

diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 43d241c40936..555689253634 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,7 +1,6 @@
+AUX indilib-1.9.4-musl-stdint.patch 3712 BLAKE2B 6642d8dc96779aaba01cccbb4ef5f2ab280ce4f9d8076c244d52d085545679c56b8aa0490fb331617becd4ba2eed62aa1a8bd1f9f3bae9b94b145b5148dd7748 SHA512 31b9d57b2353e5876da74048839e3b94f35c087d38834429dd6955045ae64f8c7cbc6f8f3f5e6f7441044cc5b80655eec8476726cf10f5de0e1d6a07c4a4d2fb
 DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
-DIST indilib-1.9.3.tar.gz 2350168 BLAKE2B 4e61f79a08d32ee829bb420c2f316f9f0168d21d6d2f11905142efd390e989571a3120ea5d123df4af05d0c6c7a4a7323f8c9fc95bc652afef3fd57bc9728c88 SHA512 d0c1b17f75a25e546261cabe644420dca155672d9223eaf48fad7ed5bbc3fcf80784df1ff21c5edded0f80e0c5ef61303892afa597b611dfd3f57a1a113be5f7
 DIST indilib-1.9.4.tar.gz 2370816 BLAKE2B 4df98abfaecdfe226d889e063928d3d5a09f9141b7bbeb2798da8190f874d0137313ff05b9c524a645440298d79655f9627ac611ae3132ee30f902e46d2db34d SHA512 2331d49545cfeb5904529f74b52ba0454c81066cb644e158e159a8f3597269d6d48bb1a608162771108c30f2fdb7e21fc5c1078b152f0e2a640f2e10ad3f9142
 EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468
-EBUILD indilib-1.9.3.ebuild 1538 BLAKE2B 23c116401ae7a896c699456300935eb1661bb290d6789e0de63231cea35a897460f658b41fd9120a2fa6832522c7934c633596a6f60ede1d35d307560a4aa7da SHA512 20d32f54890a0c4a73ded0066b27f2838d139e889de3713593bb3d124bf080a64e58ff725155f4e297287614984048de49d1c1eb2141504509d2d444c639595b
-EBUILD indilib-1.9.4.ebuild 1541 BLAKE2B 2eb032352d2c0de268a872be07553bbc1189b35f6da14eb019aa3b3b501b351b1cbe97ab8e3b72e80039464dd3e0705adb3bd9de037b2eaf1ef7dca4d1955c0f SHA512 f9c8bc335a4289332adbfc83c5aa7a1beb8830895210d470cb0af3d0f67ea07aed8c3fe8674294906d6faac0996c653f5e5937190dbd2a14249ca4e43ac9ed27
+EBUILD indilib-1.9.4.ebuild 1596 BLAKE2B 1a9be2d46147a85a30c01c96d12325e45a3713e1a7e212937564826222d2244052cdbc440cde002ee930d3c494c36f6aa7a2c1ef41df674293d562363e900882 SHA512 b3a896bc74c205043377901bb660f9852fa348e9637df0c3175c6174ea35d8cca6c817c325491473518b3a751ff11fe7f804df4765132f09466129b055bbd3f2
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch b/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch
new file mode 100644
index 000000000000..9adfae6bac25
--- /dev/null
+++ b/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch
@@ -0,0 +1,108 @@
+https://patch-diff.githubusercontent.com/raw/indilib/indi/pull/1618.patch
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Feb 2022 08:16:44 +0000
+Subject: [PATCH] Use <stdint.h> for uint* types (fix build on musl)
+
+<stdint.h> is already being used in some places, as are its
+types, e.g. uint8_t, but in some places, non-standard types
+like u_int16_t were being mix-and-matched.
+
+Consistently use the <stdint.h> types to fix build on e.g.
+musl.
+
+Bug: https://bugs.gentoo.org/829487
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/base64.c
++++ b/base64.c
+@@ -45,7 +45,7 @@
+  * Swap bytes in 16-bit value.
+  */
+ //#define bswap_16(x) __builtin_bswap16 (x);
+-#define bswap_16(x) ((__uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
++#define bswap_16(x) ((uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
+ 
+ #include <arpa/inet.h>
+ #define  IS_BIG_ENDIAN     (1 == htons(1))
+--- a/drivers/focuser/focuslynxbase.cpp
++++ b/drivers/focuser/focuslynxbase.cpp
+@@ -2821,7 +2821,7 @@ bool FocusLynxBase::SyncFocuser(uint32_t ticks)
+ /************************************************************************************
+  *
+ * ***********************************************************************************/
+-//bool FocusLynxBase::setMaxTravel(u_int16_t travel)
++//bool FocusLynxBase::setMaxTravel(uint16_t travel)
+ bool FocusLynxBase::SetFocuserMaxPosition(uint32_t ticks)
+ {
+     char cmd[LYNX_MAX] = {0};
+@@ -2886,7 +2886,7 @@ bool FocusLynxBase::SetFocuserMaxPosition(uint32_t ticks)
+ /************************************************************************************
+  *
+ * ***********************************************************************************/
+-bool FocusLynxBase::setStepSize(u_int16_t stepsize)
++bool FocusLynxBase::setStepSize(uint16_t stepsize)
+ {
+     char cmd[LYNX_MAX] = {0};
+     int errcode = 0;
+--- a/drivers/focuser/focuslynxbase.h
++++ b/drivers/focuser/focuslynxbase.h
+@@ -28,6 +28,7 @@
+ #include "connectionplugins/connectiontcp.h"
+ 
+ #include <map>
++#include <stdint.h>
+ #include <termios.h>
+ #include <unistd.h>
+ #include <memory>
+@@ -154,7 +155,7 @@ class FocusLynxBase : public INDI::Focuser
+         // Set functions
+ 
+         // Position
+-        bool setStepSize(u_int16_t stepsize);
++        bool setStepSize(uint16_t stepsize);
+ 
+         // Temperature
+         bool setTemperatureCompensation(bool enable);
+--- a/drivers/rotator/gemini.h
++++ b/drivers/rotator/gemini.h
+@@ -23,6 +23,7 @@
+ #include "indifocuser.h"
+ #include "indirotatorinterface.h"
+ 
++#include <stdint.h>
+ #include <map>
+ 
+ class Gemini : public INDI::Focuser, public INDI::RotatorInterface
+@@ -132,7 +133,7 @@ class Gemini : public INDI::Focuser, public INDI::RotatorInterface
+         // Set functions
+ 
+         // Position
+-        bool setFocusPosition(u_int16_t position);
++        bool setFocusPosition(uint16_t position);
+ 
+         // Temperature
+         bool setTemperatureCompensation(bool enable);
+--- a/drivers/telescope/celestrondriver.h
++++ b/drivers/telescope/celestrondriver.h
+@@ -28,10 +28,7 @@
+ #include <string>
+ #include "indicom.h"
+ 
+-#ifdef __FreeBSD__
+ #include <stdint.h>
+-typedef uint8_t u_int8_t;
+-#endif
+ 
+ //#include <thread>
+ //#include <condition_variable>
+@@ -312,8 +309,8 @@ class CelestronDriver
+ 
+         // get and set guide rate
+         // 0 to 255 corresponding to 0 to 100% sidereal
+-        bool get_guide_rate(CELESTRON_AXIS axis, u_int8_t  * rate);
+-        bool set_guide_rate(CELESTRON_AXIS axis, u_int8_t  rate);
++        bool get_guide_rate(CELESTRON_AXIS axis, uint8_t  * rate);
++        bool set_guide_rate(CELESTRON_AXIS axis, uint8_t  rate);
+ 
+         // Pointing state, pier side, returns 'E' or 'W'
+         bool get_pier_side(char * sop);
diff --git a/sci-libs/indilib/indilib-1.9.3.ebuild b/sci-libs/indilib/indilib-1.9.3.ebuild
deleted file mode 100644
index deebba080bd7..000000000000
--- a/sci-libs/indilib/indilib-1.9.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/lib/}"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86"
-IUSE="ogg rtlsdr test websocket"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/fftw:3.0=
-	sci-libs/gsl:=
-	sci-libs/libnova:=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	rtlsdr? ( net-wireless/rtl-sdr )
-	websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-kernel/linux-headers )
-	test? ( >=dev-cpp/gtest-1.8.0 )
-	websocket? ( dev-cpp/websocketpp )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
-		$(cmake_use_find_package ogg OggTheora)
-		$(cmake_use_find_package rtlsdr RTLSDR)
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-
-	if use ppc || use ppc64 || use sparc ; then
-		# Broken on big endian for quite some time.
-		# Reported upstream: file needs to be replaced w/ a normal library
-		# for b64.
-		# bug #763126
-		myctestargs+=(
-			-E "(test_base64)"
-		)
-	fi
-
-	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/indilib/indilib-1.9.4.ebuild b/sci-libs/indilib/indilib-1.9.4.ebuild
index b6d000763a3b..54d7bca89031 100644
--- a/sci-libs/indilib/indilib-1.9.4.ebuild
+++ b/sci-libs/indilib/indilib-1.9.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv ~x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
 	websocket? ( dev-cpp/websocketpp )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.4-musl-stdint.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DINDI_BUILD_QT5_CLIENT=OFF