Merge updates from master

dev-libs/gpds/Manifest

@@ -1,2 +1 @@
-DIST gpds-1.8.3.tar.gz 875674 BLAKE2B 18f4a8633960e68529255d2625d03bb652c30dc239969f97e9f1ac99031c104f3706bb55c7c755abb304889e9e6747ff76a16c4233f092f9175550280f80a6b9 SHA512 a981c2d136bd4e5cd81ddc457252fa8e87353f63bc8e00d42a8c4a9e6daa8e6b9fd5a18a11c402c1cfe9885f8ba5f995f97cb5ea2aa69e1339b02e4d66f08d43
 DIST gpds-1.8.4.tar.gz 875582 BLAKE2B f4ddb017e381708f6b0de2d32fe8802cd6e79000b9d238351564b71aac2bf7045954a7244dcc06f12ed1d43aeb046d56bbfe45bc64155d42d3d025b9e48cdf2d SHA512 dcf586dbb79335667a679038d366d1314aeb46357b1d1a5907b8a492cc31560a95371ec967be0ea388ca9744d864e1740031f9f6273450bc2361bb74e76df355

dev-libs/gpds/gpds-1.8.3.ebuild

@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A general purpose data serializer"
-HOMEPAGE="https://gpds.simulton.com"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/simulton/${PN}.git"
-else
-	SRC_URI="https://github.com/simulton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	S="${WORKDIR}/${PN}-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples +spdlog static-libs test"
-RESTRICT="!test? ( test )"
-DEPEND="${RDEPEND}"
-
-DOCS=( license.txt readme.md )
-
-src_prepare() {
-	cmake_src_prepare
-	use static-libs || sed -i -e '/TARGET-STATIC/d' "${S}"/lib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGPDS_BUILD_STATIC=$(usex static-libs)
-		-DGPDS_BUILD_SHARED=ON
-		-DGPDS_BUILD_TESTS=$(usex test)
-		-DGPDS_BUILD_EXAMPLES=$(usex examples)
-		-DGPDS_FEATURE_SPDLOG=$(usex spdlog)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-}

dev-libs/gpds/metadata.xml

@@ -5,9 +5,6 @@
 		<email>vowstar@gmail.com</email>
 		<name>Huang Rui</name>
 	</maintainer>
-	<use>
-		<flag name="spdlog">Enable spdlog sink feature</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">simulton/gpds</remote-id>
 		<bugs-to>https://github.com/simulton/gpds/issues</bugs-to>

dev-libs/qschematic/Manifest

@@ -1 +1 @@
-DIST qschematic-1.5.1.tar.gz 1510872 BLAKE2B 4ecf1200f4aa8052aa1ded75f6247b2db4db8a85383b04bc4c7cec495d5d2b3d4b93d96c6fcbdf370d5470be6e7e00c032ba26d0e9d5b1ac491c78286d25b55c SHA512 4b748397e83369764f3f1df49701ffe3dccb18713c0e2f55c1110b31c294f0205da10c06fd56ca0011e3f8f5a0a9970149ed84a586d6edd4febe18170d89723d
+DIST qschematic-1.6.0.tar.gz 1511024 BLAKE2B ac2866773a27526d1449a56ed41177b9337599cd37aa7d2deda5b1136fb50ab82d1b3bf032d0e04c33e209b9eb6ad7a400aad46c61c8c4ec09473da49306cab2 SHA512 977a13e1bf1d3a517d6b75236667abc0ca463910e06d1c1f0071d134c95d95897582aafbc1fa560f69137e536e626d7025393b5a0f48b462380ded6a658dd0f4

dev-libs/qschematic/files/qschematic-1.6.0-gentoo-cmake-option.patch

@@ -42,30 +42,6 @@ index b077470fe4d3..1f81a9c8ee8b 100644
  if (NOT Qt6_FOUND)
      find_package(
          Qt5
-diff --git a/qschematic/CMakeLists.txt b/qschematic/CMakeLists.txt
-index 7e80a3a445cc..8368e5742b43 100644
---- a/qschematic/CMakeLists.txt
-+++ b/qschematic/CMakeLists.txt
-@@ -153,7 +153,7 @@ endif()
- # Static library                                                               #
- ################################################################################
- 
--if (QSCHEMATIC_BUILD_STATIC)
-+# if (QSCHEMATIC_BUILD_STATIC)
-     add_library(${TARGET_STATIC} STATIC)
-     setup_target_common(${TARGET_STATIC})
- 
-@@ -161,8 +161,8 @@ if (QSCHEMATIC_BUILD_STATIC)
-         ${TARGET_STATIC}
-             PUBLIC
-             QSCHEMATIC_STATIC_DEFINE
--    )
--endif()
-+     )
-+# endif()
- 
- 
- ################################################################################
 diff --git a/qschematic/external.cmake b/qschematic/external.cmake
 index 80aae6c29b94..7e57f0852ac5 100644
 --- a/qschematic/external.cmake

dev-libs/qschematic/qschematic-1.6.0.ebuild

@@ -50,7 +50,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.5.1-gentoo-cmake-option.patch"
+	"${FILESDIR}/${PN}-1.6.0-gentoo-cmake-option.patch"
 )
 
 src_configure() {