From fa1962ff69701bd9c0f15fb225cdbfb487125e0e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 15 Jul 2022 19:43:32 +0100
Subject: gentoo auto-resync : 15:07:2022 - 19:43:32

---
 sci-libs/Manifest.gz                               | Bin 44565 -> 44565 bytes
 sci-libs/geos/Manifest                             |   2 +-
 sci-libs/geos/geos-3.10.2.ebuild                   |   2 +-
 sci-libs/linux-gpib-modules/Manifest               |   3 +-
 .../linux-gpib-modules-4.3.4-r1.ebuild             |   2 +-
 .../linux-gpib-modules-4.3.4.ebuild                |  69 ---------------------
 sci-libs/netcdf/Manifest                           |   3 +-
 .../files/netcdf-4.9.0-fix-musl-execinfo_h.patch   |  46 ++++++++++++++
 sci-libs/netcdf/netcdf-4.9.0.ebuild                |   1 +
 9 files changed, 53 insertions(+), 75 deletions(-)
 delete mode 100644 sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
 create mode 100644 sci-libs/netcdf/files/netcdf-4.9.0-fix-musl-execinfo_h.patch

(limited to 'sci-libs')

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6916e2fb712c..2c010dbbfd2f 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index d7b358a3ebb0..ec2d6ba43be5 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,6 +2,6 @@ DIST geos-3.10.0.tar.bz2 6799370 BLAKE2B dd1490318fccda8ccaf5152f8521ab98ef5e4b1
 DIST geos-3.10.2.tar.bz2 6714655 BLAKE2B 1bc4f29a28b2b49faa9e1ea2aba7359d6dcb124136e0a2d2069508f7b95fae09e59ecb0acf3742d9261444055e85471cf45baba6e278c8b3501e91eacf3bb886 SHA512 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126
 DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f98df95d5aaf9f6fd957ebcdbdefb43ae4fb17a5a671b6dfdb812bdacfdbfdfdea6e5bd44f135e3701a3cc914d SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189
 EBUILD geos-3.10.0.ebuild 887 BLAKE2B 3653d5849387cd8890c49f497fa263961320af636ccf723ac9ec2ce77dc29dd184aa2cc954d28836d6458ba2471096d351bfa1873a62fd8dd1326e170470e186 SHA512 298d9191f68705e2bdff66b74876277e97ba218d0611a6c03e5de00afe4e59a6819712a9817a6fcc419e8a867aaeb8678ebe261bf352c90a93bf14020f67bb1b
-EBUILD geos-3.10.2.ebuild 888 BLAKE2B 0d4032484b9f7b978ede5881ff5c2b088b03141e953d7c570da8dbd1ab46cf02ab016f61724e0d2fb6666dabaf1dbc0d2146fe882ac7b6324c5905c6652f2e8d SHA512 50c4dc2607998f0f7ff21710a891d630a52175f679be31f390687c3294b790c166870ecb8dc62e8f10194665d0169776517ebab295c688a82e3ccd94e364d783
+EBUILD geos-3.10.2.ebuild 887 BLAKE2B cedeb9928f835f717be0e15db238cb629ff69dbecbe095c3f8b8eabda0a8c45d77941d756c7546b2d412bbaa2621c851980789d8bd86014d4d2acf263a0f3ee3 SHA512 6abc5c16e8c6360d34a56d1e2dd3d8c8de5d8831609ca8b27e95cb20cf47362c19fa88b0d936f42f1c0efcc7158e9e957e81ffb70d95ada4d8369fa734ffa48c
 EBUILD geos-3.11.0.ebuild 975 BLAKE2B 859c4231c089d683eb74cddf666bc314ec7014047c3e3c6de29859a6102868a2cc0c0ab42994bbe4783ded6d5b8cb28cf54f14c5516b76ae87a8e1ed7097fac4 SHA512 aaae02227cb87fc91bba5e3e8181c8e0765294bfade3427e0cd784974011d7baf41bdcf98eb4899ac3d21def745679477f74a31efa6633c92e5b3f0812029366
 MISC metadata.xml 990 BLAKE2B 7ad10fb1fcd8f933626c7a4d943070e147e6ff7776c4c57960cb42433c102036fdd724fd7288ea40aafe99c3255490fe304bfc4932e0c866349a38703c3990eb SHA512 1a2e4778017e909088675a9fc4e27e5b4e4aee4ec82708dd9ad9e3abfc8ce44f68bc19e70ab9de7543caf8379b151c40a2cdbe5e3a599216b201ef2fae8d4452
diff --git a/sci-libs/geos/geos-3.10.2.ebuild b/sci-libs/geos/geos-3.10.2.ebuild
index 88688b2e75e1..f9edb3409911 100644
--- a/sci-libs/geos/geos-3.10.2.ebuild
+++ b/sci-libs/geos/geos-3.10.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 60aace02e58a..ff5cec12349d 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,5 +1,4 @@
 AUX linux-gpib-modules-4.3.4-kernel-5.17.patch 853 BLAKE2B 501282329fdf34d2bb0ccbed9f8bb865711d505ba2a444d659fc97deffae27d179cad522239efd4c63767705e45881c6fb6e1d2f6815085204215bbcbd89606b SHA512 275c693b35885f4913345de26ca17c88deecd3e8513e73787342808fb4ed021dbfc88e6233b5f04cd6b892e43a601a24de27fd656ba6085b3027acbe96c7bc55
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
-EBUILD linux-gpib-modules-4.3.4-r1.ebuild 1334 BLAKE2B 592bf2c852575e7da96bd8a5ba2af12be7443287930c73f09cc8627071da1f9c88e7bd9f90bb3093a3c83030a88d37daef19da0fd2975585d55530c38f7badcb SHA512 d21bfe260d126a3e846da56d183ed21e6f84a406f3b547c9a6b997f22d689b609da4abc07f23b71d9861fd7698ad5b94e043517b181952fa4663da2e41605992
-EBUILD linux-gpib-modules-4.3.4.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
+EBUILD linux-gpib-modules-4.3.4-r1.ebuild 1333 BLAKE2B 01222b3916c94f37a1c56730250a8c18e7edc7dff38f24deedd8fb03a252bb463be715ce5c876a84b1b9a27296ea99ad3a4003ead13f9b5ab2f2110e87c36e55 SHA512 c0933ba0c463a167566448a5ee2b46dee929c6e9251baa0182a681d75c71eefb367fbc385cc2b48b0debd4ccda9259c40caf5eccd4a08587cf3ed2b2eadb0f5c
 MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
index 3c48db034bcd..deba2dcfbbd1 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/linux-gpib-kernel-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug"
 
 COMMONDEPEND=""
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
deleted file mode 100644
index a5c44ee72549..000000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	!<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is -lt 2 6 8; then
-		die "Kernel versions older than 2.6.8 are not supported."
-	fi
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	my_gpib_makeopts=''
-	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
-
-	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		docdir=/usr/share/doc/${PF}/html \
-		${my_gpib_makeopts}
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		DEPMOD="/bin/true" \
-		docdir=/usr/share/doc/${PF}/html \
-		${my_gpib_makeopts} \
-		install
-
-	dodoc ChangeLog AUTHORS README* NEWS
-}
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index db562270ffa6..1a4945ea5f51 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,11 +1,12 @@
 AUX netcdf-4.7.4-big-endian-build.patch 1892 BLAKE2B 9209f042f86e4eb7d3c1359ff8c1c033eab2762aa6bf5b7a8f8e513ac52eddb2039c1728d77a2e038985a8612a04ba5654d27c872f92bcd54dde4237dc427288 SHA512 5d6cf04597897faed7ecdd4c8c182f3d22082569cbb726b25d8e922c853dbe4e7e8105c9470faaed50e254072f9411ebfc9aabc480858a0bd7fd8d77a9a2e87c
 AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee
 AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b002942d7198d0a98b7d64a843056f2b0ac8888c9bd6cf37f74f5788a1b075a309c60a9e80a1e072dd1ff45cf3213ad7ffe4d SHA512 e2dcf92063806e56ec02df8a3b2dea97b67ee58768703db2672188d9837188f7bab68a04da2df78b6130c6d87137f8b9974b91d09eab8cd90dba77aadac6ea5e
+AUX netcdf-4.9.0-fix-musl-execinfo_h.patch 1098 BLAKE2B 3c063fbf452e045b96b411ce1810ea0d535a66f90d421412c9994313303d31b3d4be3377727a0182bac27eb5cb6e675bd3007090d2a94b13dc23a1a1bc252a12 SHA512 aae74f9bef1ec09ac3a488a1305a812b18aeaec6028d57e45f667727f36421676dc20d6f9589284c7b5dbb0957c23ac426ac3ca2f05a10e1b4d6de26851405e4
 DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
 DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
 DIST netcdf-4.9.0.tar.gz 19491744 BLAKE2B b669f7ccb2f7a8def9d5b944a97d101ea7b7307d6e1495a97c0966b4ac9722b404d6039dee192da759d14d52259be2ff4f49be3bfb6cbbfac48732684cbff9c3 SHA512 62cb593b99a6e9c56426175d141907572d3974de8dc39549c85337acf410539f9b7dcd9a375808e271da1d0dc93fce7586b955eddd2bb45901d9cc48a72db705
 EBUILD netcdf-4.7.4.ebuild 1703 BLAKE2B 33294c879140f07bce3943cf77ec41b36045dd9df219d0cf1f3784a683b6392a6c3adb5561c6b2f18048379580fd28c6782bea986a5b5f422c5ec103a7c64b13 SHA512 7d6ea028a446b4f0d8a5cfd8b22c15f582722ae3f6f839c28a42e3a45ed9ed7952ff8c3bd5b43471c02ba237d06707d8cba8399e489eb1cb1849a9fa7f3f39d8
 EBUILD netcdf-4.8.1-r1.ebuild 1810 BLAKE2B e73bab3d4748a0e509f5f6bfeae90ac10250744e3cff0bd588b9337a340c177c97cbb424f7880a5285026b997ec378631933979cfe9b4694d41e4244aabf9bb4 SHA512 aae2f847567d803b175ce97a529763f4e1c74e7a5b65fd85ec235b2451ce02c7afabaac2a90bb4904f8068f822ffac5329fefd5108d396788d36bda6968380c3
 EBUILD netcdf-4.8.1-r2.ebuild 2005 BLAKE2B 27ddd0dfc01e7ba32d889efb9085c9b16f4cdd076e860c2734ad78397d562c3eb2e1a231449983b5817968efe211ced789f0624d621d257c565ca362a02b1a3d SHA512 3672c96fca8d1d60f1757192d4d39cb0d0a5f57fe8e102de1a4bfc16449c478ae9c7fb2aeb42b669241c269d9dbd1cdba6712cfbcd52d595cc7bbdf733b0eedd
-EBUILD netcdf-4.9.0.ebuild 1798 BLAKE2B 96a50cc2fc982431cd12f210f91fe49f6d0ba33c7750f868ff7e4ca3370ada3c8e2cf69c758df577b2d9ab466927071f80a4917671596accfa44f6bcaa7fe8c6 SHA512 705c6306a510b8748f9e4b8215f9f311df8e724c4c7769c7dc2417a878fde5152d2c22b361b00810f3bd564e53259ec7784c4e16e1560dd1f3621d20f149c1a4
+EBUILD netcdf-4.9.0.ebuild 1851 BLAKE2B d6378eebacee1769d6f99b9702ed9a18b1295fc99554b66d3d61e8b40e1d4a1dd973efea929491f69be3fe4b5cf897220541df78f2c81dd87c5415beb3ce9590 SHA512 c3edd8b82bb64e85c6b649b80c4a0ae7621e9ad05063dbfb5a79cf4c93f4c954b54464840c32a296126857cae521c65d805aa7b65423acefd6b762253c32a75a
 MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b
diff --git a/sci-libs/netcdf/files/netcdf-4.9.0-fix-musl-execinfo_h.patch b/sci-libs/netcdf/files/netcdf-4.9.0-fix-musl-execinfo_h.patch
new file mode 100644
index 000000000000..7b711327512a
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-4.9.0-fix-musl-execinfo_h.patch
@@ -0,0 +1,46 @@
+# Conditionally include execinfo as it's not available on all libc
+# systems. There is a PR upstream for a similiar issue but the actual
+# issus is not reproducable on Gentoo [math library not found] [1], so
+# for now this is a temporary fix and can be removed once the PR [1]
+# is merged upstream.
+# [1]: https://github.com/Unidata/netcdf-c/pull/1701
+#
+# Closes: https://bugs.gentoo.org/828677
+--- a/libhdf5/hdf5debug.c
++++ b/libhdf5/hdf5debug.c
+@@ -5,7 +5,7 @@
+ #include "config.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+-#if !defined _WIN32 && !defined __CYGWIN__
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
+
+@@ -15,15 +15,18 @@
+
+ #define STSIZE 1000
+
++#ifdef HAVE_EXECINFO_H
+ #ifdef H5BACKTRACE
+ #  if !defined _WIN32 && !defined __CYGWIN__
+ static void* stacktrace[STSIZE];
+ #  endif
+ #endif
++#endif
+
+ int
+ nch5breakpoint(int err)
+ {
++#ifdef HAVE_EXECINFO_H
+ #ifdef H5BACKTRACE
+ #  if !defined _WIN32 && !defined __CYGWIN__
+     int count = 0;
+@@ -39,6 +42,7 @@ nch5breakpoint(int err)
+     if(trace != NULL) free(trace);
+ #    endif
+ #  endif
++#endif
+ #endif
+     return err;
+ }
diff --git a/sci-libs/netcdf/netcdf-4.9.0.ebuild b/sci-libs/netcdf/netcdf-4.9.0.ebuild
index 8ffc629f18a2..651ca0381223 100644
--- a/sci-libs/netcdf/netcdf-4.9.0.ebuild
+++ b/sci-libs/netcdf/netcdf-4.9.0.ebuild
@@ -36,6 +36,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.4-big-endian-test.patch
+	"${FILESDIR}"/${PN}-4.9.0-fix-musl-execinfo_h.patch
 )
 
 src_configure() {
-- 
cgit v1.2.3