gentoo auto-resync : 31:07:2023 - 22:45:52

6 files changed, 43 insertions, 3 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b9babfafcdcf..576e5f1fa76c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 2c6edafdc30c..d92ae3707a31 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,5 +5,5 @@ DIST gdal-3.7.0.tar.xz 8604724 BLAKE2B 400cc17fc636c637f7c40e93aed8e2db7bfbbe737
 DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
 DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B cac18436ad2acb558e27e8ba3f1f2c22aa6c7ba258abe25118acf65fb2cb8a3d5f132ccb8315912a54d07f035b5ff331cf6a66bdf51a54c8275c5203e844eb82 SHA512 81e80c799a8a910a861182480e8306c8583cdffe7cb62f47fbaddf031e1c4d1d3fb341edf0daddbb8c934e5f2d547b380feb2f5a9f22cd50db14e43c2b02737b
 EBUILD gdal-3.6.4.ebuild 6772 BLAKE2B 63e9d689bfbb54948a43756f47acb6aec7030f4fffda1fd5f2ca8d6a8ea9e2aa93ffe7e1c18404ec58e66ba9f94f648f004c7aa4497e1e2cdb9647c0bbd8bd79 SHA512 735ff9adbbc31ee5ac934a832637b35db99e9b64e67110c014a958f485692ae1e2d479bc2642bf35924e38bc3306c086386ae031b783ae03b1938f7586dff750
-EBUILD gdal-3.7.0.ebuild 7522 BLAKE2B 610681e6002e266ba379f44b9c38aef9a2ec95cea8610ff0abb75d05d5512ddaa3f5c9cff33205bfc6b771988c7d98220d2a37899c24508e0f0756f13b7cb07b SHA512 491204c658be1e8614032ba9aa874ebd965234cf5be528a30417e7df1d0ee6561dbe7d25b7a7cce67b922cbd33ed0c2bbfed7a957fa53eb5eb4cf1f92617215c
+EBUILD gdal-3.7.0.ebuild 7537 BLAKE2B d1fa3dcc29e007421fa5d507a5dbfae014e692a4ee23425c521dae7cea95dd763ce768508c8276f4f391206752329d4abd01068b89f6be4954b753f448b937ae SHA512 7d6857eaa0eaea290d1f8eb8110de9e35dbffad9d0c358e49659b71693c2fef30b3448d8beebad33bf3343dc829fbc6a47fb6e19a88aff21c1f10d360ad3d5e5
 MISC metadata.xml 1348 BLAKE2B 6666f26bc5f48bbfe1971736c6737420fefa7949cd6e1b74c649ae53cb51b756ebba42bb934930af83de254bebc4e4268f60a04ed2fb1aa8835b9abbdb3968b2 SHA512 b5b90368a48679c780dbe89b73ddee9e2c74639bf1a2c9f39dd4a3cdbb005878cd2197271f2ddc23d9611feaf79c0239b32d655d8a29592ad6d87a402970b726
diff --git a/sci-libs/gdal/gdal-3.7.0.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild
index 7c62bbd95436..b652d383e470 100644
--- a/sci-libs/gdal/gdal-3.7.0.ebuild
+++ b/sci-libs/gdal/gdal-3.7.0.ebuild
@@ -60,7 +60,7 @@ DEPEND="
 	heif? ( media-libs/libheif:= )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
 	java? (
-		>=virtual/jdk-1.8:*
+		>=virtual/jdk-1.8:*[-headless-awt]
 	)
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index ef315fbc306e..011dcf89c0d3 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,6 @@
+AUX indilib-2.0.2-musl.patch 1693 BLAKE2B 7137ea564af32eb6e6f6440c97c98ebf18c25b51e37678f08e359afacbcf98dfd66f7820712d7ab6022693f673e9a4136bc86a4cd473962a3019e2a618e78c43 SHA512 5e0bf356e5631f459db1d37d75faa8073b8fdcdf7465f16a12f0ddfaed0627366de2278d441fe234e342ac66d624d0be3f4ac8c72416911b2b5c4477ec7c25eb
 DIST indilib-1.9.8.tar.gz 2633085 BLAKE2B 045d38fc565546528fddfa83cfd78650d30e41769923d7ec8f462a617fdd298228913a075a9f0b511867aa9174143da010bbb4c015d8b5a1d51f2b80090e50d5 SHA512 b9551547de277fe311e4779e65915351850a25fb049ddcfad634ef385014b521416f2366cf50cda80cdfa4a754c18face21cfd59f7f45c4018ca733ddf981ab2
 DIST indilib-2.0.2.tar.gz 2708561 BLAKE2B 57fc3ec79656644380e4e35ebd78cb276afba072894e44a9e30f6c82abf969d79499682821ddaa06fc9698bc8b9f09c98f764c60fab6f5df6ab00de321f5ecd3 SHA512 6cfb00669da71310811fd1668afc2f3b68060b5ca6addaaf3834fe574dc5da1a07c7f799bed3e1b7fe9e6df2367dfc835895cf9e58a65a1fbd8a7c10b7db39bc
 EBUILD indilib-1.9.8.ebuild 1584 BLAKE2B 2827b82ac291561310999e490bc921ac1de93c5b87489286ffee984d0948703a7699267a1b8150def0f9119f0b07a404a43ac84047d5abae9f028161bf46b7a1 SHA512 b803eca3941e5e1e308344db9a9c6ff733690efc1538e82662a1befa720787e1fc8f08052874a2041d95e41cd6b271cbb0d7c5296d297e2dd000a2eda5c61897
-EBUILD indilib-2.0.2.ebuild 1676 BLAKE2B df40a820ae8638be0ea0f67f35b8ec9d1e357c6fe47f137e96cbcedc55d99c81118ae1530d452759c7ed41ed6e2ca8396f13473cdfffe25276cf47bf5e30adb7 SHA512 f7f2ca8ba14cd21272b92262fcaddde0953638b69d7174f4965f6d7e6cc9956622c8ef6d685267a3ab384862437a1be4d43d7c7dbb0db6db507be805edec1d77
+EBUILD indilib-2.0.2.ebuild 1744 BLAKE2B 93ffff05345fd25a889f50f78230e3f643c864e648560165438829b17782e6dac50fc07c6e84eba5644bee15b018924a95945b4fb563a2903f13ee41744f2f22 SHA512 487374f58cb2fe6bfd20c6c999d03c9d2cee4843fe8fbe5f8a65461f1fe020dd6429dfa7d6537e2c7ad884113bbbf1532a1b1ff041dff8cc7f206e5c4eea96f8
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/files/indilib-2.0.2-musl.patch b/sci-libs/indilib/files/indilib-2.0.2-musl.patch
new file mode 100644
index 000000000000..5e906bdef748
--- /dev/null
+++ b/sci-libs/indilib/files/indilib-2.0.2-musl.patch
@@ -0,0 +1,37 @@
+From 2e95bc3a8487912c3edc5d83e00557d20335ba3e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 26 Jul 2023 05:30:00 +0100
+Subject: [PATCH] drivers: auxiliary: use stdint.h types (fix musl build)
+ (#1914)
+
+---
+ drivers/auxiliary/pegasus_upb.cpp | 2 +-
+ drivers/auxiliary/pegasus_upb.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/auxiliary/pegasus_upb.cpp b/drivers/auxiliary/pegasus_upb.cpp
+index 6aa290a2d8..437d3e19cc 100644
+--- a/drivers/auxiliary/pegasus_upb.cpp
++++ b/drivers/auxiliary/pegasus_upb.cpp
+@@ -1356,7 +1356,7 @@ bool PegasusUPB::sensorUpdated(const std::vector<std::string> &result, uint8_t s
+ //////////////////////////////////////////////////////////////////////
+ ///
+ //////////////////////////////////////////////////////////////////////
+-bool PegasusUPB::stepperUpdated(const std::vector<std::string> &result, u_int8_t index)
++bool PegasusUPB::stepperUpdated(const std::vector<std::string> &result, uint8_t index)
+ {
+     if (lastStepperData.empty())
+         return true;
+diff --git a/drivers/auxiliary/pegasus_upb.h b/drivers/auxiliary/pegasus_upb.h
+index 47546f7453..7b6cae6de9 100644
+--- a/drivers/auxiliary/pegasus_upb.h
++++ b/drivers/auxiliary/pegasus_upb.h
+@@ -141,7 +141,7 @@ class PegasusUPB : public INDI::DefaultDevice, public INDI::FocuserInterface, pu
+          * If the previous stepper data is empty then this will always
+          * return true.
+          */
+-        bool stepperUpdated(const std::vector<std::string> &result, u_int8_t index);
++        bool stepperUpdated(const std::vector<std::string> &result, uint8_t index);
+ 
+         int PortFD { -1 };
+         bool setupComplete { false };
diff --git a/sci-libs/indilib/indilib-2.0.2.ebuild b/sci-libs/indilib/indilib-2.0.2.ebuild
index d7542c61a1ac..64fd177a06a1 100644
--- a/sci-libs/indilib/indilib-2.0.2.ebuild
+++ b/sci-libs/indilib/indilib-2.0.2.ebuild
@@ -40,6 +40,8 @@ DEPEND="${RDEPEND}
 	websocket? ( dev-cpp/websocketpp )
 "
 
+PATCHES=( "${FILESDIR}/${P}-musl.patch" ) # git master, bug 873403
+
 src_configure() {
 	local mycmakeargs=(
 		-DINDI_BUILD_QT5_CLIENT=OFF