gentoo auto-resync : 26:07:2023 - 10:30:48

8 files changed, 93 insertions, 4 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f43d6a42b58f..d752b4ea3ec3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index d77be9695582..1bb0dfa56573 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -2,5 +2,5 @@ AUX libfido2-1.12.0-cmakelists.patch 982 BLAKE2B 58787219654244cc0d45e7529835c36
 DIST libfido2-1.12.0.tar.gz 652326 BLAKE2B e206c9c76e27037c49d3b0e842487b0711559483eb9ae638590bb7175761251c6f60dae6c6dc6cc8b13e49b9f32432ce4368e709b4aacf71f43b760092e3b00d SHA512 ae8c716fe9b2fa52f191c4b3fe61442ba0b7a364a23c6c3a29afdba4f47c5eff89cb1d6c9fcacaefd7d4ebce641d35600527ee33934786c2096ac97f78e9418f
 DIST libfido2-1.13.0.tar.gz 652777 BLAKE2B 506e0ecf89825e313fbcb0de59ef0b1a3aab483013f959b391448da0600979780ae76807639231ab8a60eead039471bba707073ec4e259b611d67031ac7713f1 SHA512 90f8452cee4c9cc72241478e697c5c692ccff5ab27752f2f296c3623ee297d1f80a85a359b4d0656c67790084c116aac921894e762eb52d3a79056e5014c03e7
 EBUILD libfido2-1.12.0.ebuild 1074 BLAKE2B 015d5d3485e2b75e31a4e5857bcab69a14498d67c8c7cd548008d3d87afb7e953235bc9b7a95285b15bbc360e6569e2201580b89835e52f2afe9534bc8c16cf8 SHA512 56ad5e8620347e5ae3a7cd18e97e5ecd959462d0398b81ecfb83ac229cb36842aa7a047ab52c1f4ee8d44355c9ca78699deb1f7432e96cfa2096278398d144d7
-EBUILD libfido2-1.13.0.ebuild 1092 BLAKE2B d5c521557953455bc678f8e3d7ca14e00f7dc71c70bf369f8be7227f7546931741756c64864c50f8f6c175d27a03a5a497681d4fa80ff1f8aa17f5a7fdd44003 SHA512 7964d034cc38eb3e3e3736fdcb0dbac4ccc6454a630ec26af78098db8382cb9272338a4e6f2f7ca0f5c0717d43fb931d6d9243f60571cf009840108f349189fb
+EBUILD libfido2-1.13.0.ebuild 1088 BLAKE2B f41a200ba3ff244c90cb28cc647328633891973d181ffeaf7c41c62f7578770fee3ed267ed0f74415908d69b1c36d028c3eee504cb14bb6fe68a9e4673fdc74e SHA512 73150d20eeef036dc77eb015ac6f45df8d7894d66d2f88c1c3298973927045c886e4fcd03a652603be6cdf54d26c3747d07911222d5495488c1224e5ec535493
 MISC metadata.xml 411 BLAKE2B 3b2e2850f194b8518267bb8125401bf7049f1b63158bdb28e63e63c03f1c50c918164911a7899790f12c2a207eee88970663a57ebdaf26fa601d77da299a0797 SHA512 dd6d40f9827d7dfb35548c201f90571cec364fe89e4b1811b37f34c1435d05c078585ed8254884370fe575a6fb58c4fb271b87007915c38dae8f945735c0b2ed
diff --git a/dev-libs/libfido2/libfido2-1.13.0.ebuild b/dev-libs/libfido2/libfido2-1.13.0.ebuild
index 567e655a7b41..6f04434652a1 100644
--- a/dev-libs/libfido2/libfido2-1.13.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nfc static-libs"
 
 DEPEND="
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 79f4384b799b..0dbc321decfe 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -4,5 +4,5 @@ DIST poco-1.12.2.tar.gz 11268579 BLAKE2B fe23216884d1effb7e93072c5e90d5eabf813c6
 DIST poco-1.12.4.tar.gz 11296139 BLAKE2B 45e1214616e78041d5ca512cee46621c006fe21f51231f3261dc40ca4941eb3cd4e52db493aa826779784f9d3f35cfd08e3e9d08fb35ebec2d610fb6528c635a SHA512 730700a24b5a00d44aa85914e7d3c9eff76969a123a67315ba5e9b2d18c0ace70d2664d8a611496851f497aa4985d36685a67813a95e814461ae0fffdb460d91
 EBUILD poco-1.11.2-r1.ebuild 3964 BLAKE2B ac053087d7eeca9274152973fd7a9a2ed21ac99c7c6aa5b85dce4667f9063e8c93c177a7ce0ef678950a80a17e8001ff8a497a367e3f57411501ef73192cc1f8 SHA512 950f19be0ef462fc7312f4c1bb2d2f74e3e15766d8c1345ae884219415df01b00b76fba3ac8110183e73908be848d4259a6c31633275de27981836afffd7a180
 EBUILD poco-1.12.2-r2.ebuild 4018 BLAKE2B 3b9672f94a9a57813d9f28ab7a8ad07ebc6acb3d077d0797d53a8c8b481b6ec842c7f23c06f60060854a0ec7cc5b3501a62e522467a843718fcc687b9d5ee4de SHA512 ea689e6f51b9fcd21e1e511322a083b58a1fc765085bbb39fd9ef630c9c42076b440c5f7a7efd09b0631431eae36e17c434d9c391311dd63949ccd55b695c144
-EBUILD poco-1.12.4.ebuild 4196 BLAKE2B 74618eb71a7e99cc0990e6f8d237d18a0fcb93bfd5ef9adfe4577369166e98fcd8d0ed8f8303b3745b5be385cd67d816f8c43bfed3ca330e78bc01463e179b0d SHA512 2343579f785c733c3d02af8bf7053eb55f46cf0b9a481a83708171c73bded665214e185ff4a7222b33e16c7374178f6e72679277320d1e1d958b52ae5c3e4205
+EBUILD poco-1.12.4.ebuild 4194 BLAKE2B 5d9719019a842106329e54e6e835f307af313729e7deda005c835a8cfac7378e77d3485c6d51179526b16e383c58366276139f70c13ab2bb6a8a56c50dcb3374 SHA512 db97efe8080b3d693d4c9dba314af6728bfd159b1f1e3f9d5c2ad189276da26007382e84839ae92b611c5a2002c944daee96a2266bce866bff2dd2170a5d9bc2
 MISC metadata.xml 2851 BLAKE2B ebfb720cf7dd8bda9f0e1af356b22eb4e9461c179d965b8ac01d654ee7d9424436c223acf6782bfb5db98e49eb04808861795d980e0dfac7ebe6e5913e078b9f SHA512 32194a768ebc061ecf8859bddc86d89c2215c0017878800f580f47002010d7d57959f89ee8c74bf0e4b2d865d8e3b37f52a523a2b9289a1486fabc147ba52e1d
diff --git a/dev-libs/poco/poco-1.12.4.ebuild b/dev-libs/poco/poco-1.12.4.ebuild
index 72819c6366e6..eb055fc6a77a 100644
--- a/dev-libs/poco/poco-1.12.4.ebuild
+++ b/dev-libs/poco/poco-1.12.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}-release"
 LICENSE="Boost-1.0"
 # SHARED_LIBRARY_VERSION -> "${S}"/libversion
 SLOT="0/94"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="7z activerecord cppparser +data examples +file2pagecompiler iodbc +json jwt mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest
index c6fac5160632..913aec894d75 100644
--- a/dev-libs/qxlsx/Manifest
+++ b/dev-libs/qxlsx/Manifest
@@ -1,3 +1,6 @@
+AUX qxlsx-1.4.6-headers.patch 811 BLAKE2B bc1ff1b9e265a7d895a36dd1b21fc241169f783b0b37ec4ede278717891702a1f821392d3c22e9d2dc1ce1c181679825f0b432026c0729c300fd819f8ea8f55b SHA512 631bb364052405a68177482976c0520e938ae8087408c23a8d1e4fbdfeee4141767d4e2cd53e9353b2b375299a64d9a05eda32878896cf5546c5b424f93fad1d
 DIST qxlsx-1.4.5.tar.gz 4705008 BLAKE2B dd853a20109c9d9dcd5757bbb436e620191eb1fb95c441b1ce3a119bd99397f6206da37b6d770c84e8717c75ce9ad1da4b82397030da02c49a092d958ebef261 SHA512 5ec63c210b12c037acd9f3cc4d351b9bd488add65872a27cca536117349ac2c2501649cb7c2f35e1ee95289e98bf9e9fea6554aef1379deafb50c5016ed21fe5
+DIST qxlsx-1.4.6.tar.gz 4705107 BLAKE2B 9329412c949d2eaaab9a1d536ca2680da0649ef8b7a07bda6f20dd3c3214db8abac458fde25f41afc8b8b22442b6b83820cefa6031ef27de857d49ebfbed774b SHA512 14651096d35889354ffc97ca80146fb6704901db210b90d5de4157ee67adddb2021a27969777369162b0f5424b31bc50596ecd86e2f6f138c329a7cf4f2161a8
 EBUILD qxlsx-1.4.5.ebuild 992 BLAKE2B 9b23e45633f01c049c4d1004cb31fa403748207952656623055c1d295d5eed8241be82fee55f4f62aef51851e57330cb5376bb40e4b6b873a4eb41f61b50371a SHA512 2533f93190e61443d71df20ccf0fd844e9c5a0fe8997639eb625e8dff03a9c9e5bf617d2226408e69fde69fa3150dbae50737c036a5b554ac3d8aa3e0999ce1a
+EBUILD qxlsx-1.4.6.ebuild 1050 BLAKE2B cf80c55b2cc3dea478f9c74ac4d18e9d73ca81db8e9d17938859b43067145b7d9bd4528d1d2cbe121e3ac4c0be9723b3a49340cb70eff988d2ec8c05ff5fc3e6 SHA512 b6e9e0297386b0b21231619400fa01033dcd30c80be28616b8e9118eaa02931f35d38c900bd3d7e4b9278f7cfd93343541c541a64c7edd4294d7570fb6f9fd39
 MISC metadata.xml 451 BLAKE2B 72b39f0c97bb2d329e87abf678364a963a0e1cceda24106ed304f50258418595349f2b88ad5d34b82677dda655d20b05176d7bd8b2e2ca2215bcf1264b5412cc SHA512 5e9172c378f82bd9fbe16f8acbc877934ebac97d5603ad471f5ad0e4c729f69fb7942125ad7cd70047a28b78b63f3fc670023018cee113061ed2a668c5fd2897
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch b/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch
new file mode 100644
index 000000000000..90dd81fb8c88
--- /dev/null
+++ b/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch
@@ -0,0 +1,26 @@
+https://github.com/QtExcel/QXlsx/pull/279
+
+From 8c3e6633e3c901bc5a5cd477383421b0980dcd26 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Mon, 17 Apr 2023 23:43:59 +0100
+Subject: [PATCH] Fix #278
+
+There's no real reason to install the same headers twice, but at least
+now clients of the library can build again
+---
+ QXlsx/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
+index 4fa7f7f..074922a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -179,7 +179,7 @@ PRIVATE
+     ${QXLSX_HEADERPATH}
+ PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header>
+-    $<INSTALL_INTERFACE:include/QXlsx>
++    $<INSTALL_INTERFACE:include/QXlsxQt${QT_VERSION_MAJOR}>
+ )
+ 
+ set_target_properties(QXlsx PROPERTIES
diff --git a/dev-libs/qxlsx/qxlsx-1.4.6.ebuild b/dev-libs/qxlsx/qxlsx-1.4.6.ebuild
new file mode 100644
index 000000000000..e30b9d9087f2
--- /dev/null
+++ b/dev-libs/qxlsx/qxlsx-1.4.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multibuild cmake
+
+DESCRIPTION="Excel file(*.xlsx) reader/writer library using Qt"
+
+HOMEPAGE="https://github.com/QtExcel/QXlsx"
+SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+# soversion
+SLOT="0/0.1.4.4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5=
+	)
+	qt6? (
+		dev-qt/qtbase:6=[gui]
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/QXlsx-${PV}/QXlsx"
+
+PATCHES=(
+	"${FILESDIR}/qxlsx-1.4.6-headers.patch"
+)
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DQT_VERSION_MAJOR="${MULTIBUILD_VARIANT/qt/}"
+		)
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}