gentoo resync : 05.12.2021

4 files changed, 30 insertions, 37 deletions

diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 979e0f157f1c..fe565ee10456 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,6 +1,5 @@
-AUX indilib-1.9.1-fix-include.patch 732 BLAKE2B e34651a2b03e71fd5da51432fb9d3eee4523f7b0fce5322a732d462448181c3a0f134261bf66110a9456117bd7fbbf7b2228987b78843033d6f8524b141dcf13 SHA512 e31be023ccc34a4437728b73569c7599b1bd43b9e86f1c886f95884e722cdf1b8a5cb263c6934ddeb172b92cecd122d7cf7e1a59137476dd16ee31e0790cd0bd
-DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297f7ee879061636f041d138a02db23525ee411782f3303a0d82bb2fc4d9d6489e2bda18f8e011bfa0d1b33595343 SHA512 d87c341efdaa8109059741738c69b9d6fb4b5dc68c774453eab378aa3784af29e8ed8469dba968a41c584fec1556fdbf0bd65cbb8aa65c2d9e1784d82e7bcc67
 DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
-EBUILD indilib-1.9.1-r1.ebuild 1330 BLAKE2B 43a126b0ef9d3ac40f7a2f3098586956d1df58501c5e4b7d67cb5006752f28b8d7c1ce7521ab51c53d47da54da329e44be020b8ba623a691ac67c4395fe2de78 SHA512 33a020e215980d154276b1382d4559fccc5e2e0ffa7a8924fb780c8d674aafbb07186c5fcc92c2a4189fe734a55680fc209278623c3318a161b8a5a46ec2ec55
-EBUILD indilib-1.9.2.ebuild 1280 BLAKE2B c9d46c8da7a629ff5b5b26a423d74e1eb9bf5ce12187f6f12f31b6b4c1d8910e5674a586fd4f5d521fcff502bb14da963d9eb74f8ee4f69a0ffd7017a12e6224 SHA512 d7d17ac330440fd6753820cf78ebdbcda1e766a62d941438eab0b2f5d3482c5084e5b68fc05f8467f2e18a6e22de4046c637267616cf8cb3b88c7d23493b2136
+DIST indilib-1.9.3.tar.gz 2350168 BLAKE2B 4e61f79a08d32ee829bb420c2f316f9f0168d21d6d2f11905142efd390e989571a3120ea5d123df4af05d0c6c7a4a7323f8c9fc95bc652afef3fd57bc9728c88 SHA512 d0c1b17f75a25e546261cabe644420dca155672d9223eaf48fad7ed5bbc3fcf80784df1ff21c5edded0f80e0c5ef61303892afa597b611dfd3f57a1a113be5f7
+EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468
+EBUILD indilib-1.9.3.ebuild 1541 BLAKE2B 2d043ba9b3fbce0370cc288931f20f116cf61dcdecc04b06a99123ec3eac099376230cef28c650db77c31cfcb31f9a9d12f69e1e9352b34092ad5e194fa0f0c9 SHA512 c520f3d8ef3399a2cb9a32143f7c578a5a0a94294dca0b061c4e1e98e5d6d7cef6afc8ab56b44e965f84ab2b5b9aeb4ef85139eb7947210a3cf1788fca5da399
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch b/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
deleted file mode 100644
index 7e3e24880d43..000000000000
--- a/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 907b3d81f27593e709af9e3f2cdc6dab05d6d80a Mon Sep 17 00:00:00 2001
-From: Paolo Stivanin <paolostivanin@users.noreply.github.com>
-Date: Tue, 29 Jun 2021 08:52:04 +0200
-Subject: [PATCH] Fix indimacros include path on baseclient.h (#1503)
-
----
- libs/indibase/baseclient.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/indibase/baseclient.h b/libs/indibase/baseclient.h
-index 6d5e49b9a..2656d7486 100644
---- a/libs/indibase/baseclient.h
-+++ b/libs/indibase/baseclient.h
-@@ -20,11 +20,11 @@
- 
- #include "indiapi.h"
- #include "indibase.h"
-+#include "indimacros.h"
- 
- #include <string>
- #include <vector>
- 
--#include <indimacros.h>
- #include <memory>
- 
- // #define MAXRBUF 2048 // #PS: defined in indibase.h
diff --git a/sci-libs/indilib/indilib-1.9.2.ebuild b/sci-libs/indilib/indilib-1.9.2.ebuild
index 164b4f030d8c..0f889477df8c 100644
--- a/sci-libs/indilib/indilib-1.9.2.ebuild
+++ b/sci-libs/indilib/indilib-1.9.2.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 )"
@@ -53,5 +53,17 @@ 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.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.3.ebuild
index 15d77f70204d..5291dd21585f 100644
--- a/sci-libs/indilib/indilib-1.9.1-r1.ebuild
+++ b/sci-libs/indilib/indilib-1.9.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake udev
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
@@ -39,10 +39,6 @@ DEPEND="${RDEPEND}
 	websocket? ( dev-cpp/websocketpp )
 "
 
-PATCHES=(
-	"${FILESDIR}"/indilib-1.9.1-fix-include.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DINDI_BUILD_QT5_CLIENT=OFF
@@ -57,5 +53,17 @@ 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
 }