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

3 files changed, 89 insertions, 0 deletions

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
+}