gentoo auto-resync : 09:09:2022 - 22:41:02

8 files changed, 92 insertions, 5 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0f2c71e45d2a..6812a713a9f5 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 557f337a5568..85503e599849 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,5 +1,5 @@
 DIST double-conversion-3.2.0.tar.gz 7031760 BLAKE2B 971c06121e64c4d78a1f9bce9b206a079ea72fb82072f5db10f9b50516ecc178ade9d5ae2d6d024fdb78607d8a1c0d9d48380acabc529eb498e37ff38297aa00 SHA512 0670ee70ed2662c6795ec6cf144e0915d805940ea0f49633d17500c496fb241788a0de6f0a9f8eaed5cb74a376f64fe590fa0d883d0676dc2bd2dab288b85e00
 DIST double-conversion-3.2.1.tar.gz 7032718 BLAKE2B 4f6fe334388b6cb0ba5edbbef761764bfe36feb83cf73281a4f5e8bb64c96923f3e33919678fe29885de0bc3b388a6e0e91f871808c215d8a3e5cc778325fa01 SHA512 d2feb3098a1d4d6baab5f89bcc29ac2e06d314d552b8c747c6eb6dba5dd165a15dc71200191edb7f05d521c349e12d59cddba3c5db101e1623e0e76e19f21a49
 EBUILD double-conversion-3.2.0.ebuild 626 BLAKE2B b7b682e635a574ec80aa781c7c99b05608cc2f39e0558107c99340b1c1b1317d48fab19b5cb906b552d2d69bab78ebcbdcd9136e1fdb090c8d138619df7f17f1 SHA512 978463432c90bf1df3507abecca9aeeb715240e17068788e30f5e796e616a7a15f6521a1c3854c7691b8f6952271077ec7a39a8c136375da70891c5282ac56c7
-EBUILD double-conversion-3.2.1.ebuild 633 BLAKE2B f24ecd2bb0f7309784d7d6d7f256dd3f8ac745f689ce8ed5f5d694cee3759b92d7d2b04647309ef5e488dfeb536c53e25a9e28d19c7a4d298d8e35d064936159 SHA512 8be59e650649bc42ae36423e9988d11147bc48f20e23ab718067026ac9ef00b1983cfa2e68e70120c063df6c16420b2442c219a22df8030c56c7c2cb4927e246
+EBUILD double-conversion-3.2.1.ebuild 631 BLAKE2B 88df4374aa609213fe44bd21eedaae7e02b67751ed5bff2da3855a047ac8839a2d34de762e986a305dc297134a74792e3f43cf2f0cb8e38609242dc3945aed45 SHA512 7b2e82b979f4b3a364164f12dc3bcddabd90e8c2da289a5eb15a0933e38f857c510c8cdf23b8de93f243ee257ad512a4acf098c9161beb786260972b6b845157
 MISC metadata.xml 682 BLAKE2B d16297d56e3609d9c14023e754fbdfd4a41d1ac91eb9e66e9b5122bfe7758d59d1b1ce92845d866e989baf8716bc425a6229098868ecdd2d8ce10c0af7808860 SHA512 f2c25b81770d33fe86231cb4c80cbfd5495d9ef493f6710c96732c4ad72523b362bd1c22316e326c500afc0f5c4ca22e77f07601a552b52ab71f24ceb4ca7e71
diff --git a/dev-libs/double-conversion/double-conversion-3.2.1.ebuild b/dev-libs/double-conversion/double-conversion-3.2.1.ebuild
index 90995a534fa0..51a3871ddae1 100644
--- a/dev-libs/double-conversion/double-conversion-3.2.1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 76aed4bdffe8..ac9cb2717eb3 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,6 +8,6 @@ AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.34.1.tar.gz 1096874 BLAKE2B be12bda63a72d25a60542c5cdadaa7dc59ad2d40d41affc0af5eab07659129ff235a62227a78285e4c00bc72a365b49691658aee7818ffc4c5d014aa0c2b0df7 SHA512 b77226c3fbba6fc9acc90deb8496370dba1384de72ce564524c03bc239846fd17c27d7e1fd7ce99161faafdd8c92413ee58ce1a74a41c786759210bbab478991
 DIST nspr-4.34.tar.gz 1096407 BLAKE2B 61199c1319578570f9569011a2fea8ec6b8c4e8337b03517d1b0e1a22749a7449feb2152c348f3a1d73fefa7aa5067be460f4cbc1728c479309f4a2592424fdf SHA512 4cfac886c14cf7df4c4b79fa1c3bc92e1b14260c9c3018fa2562060d62fecb4e66c0b4e8f7edf4f4823def784a919d99dde88a89674f0cd8a644310b0569ead4
-EBUILD nspr-4.34.1.ebuild 4866 BLAKE2B 697b2da9930276d21da3e593d3c2197c542c1f27189da164f440bd9c7429fcba2d060197d86a7a7f25579d513f5ab5129abfd9244832cc0e1492f6d654d734cf SHA512 01da9399ea5b6d98ef153cc4c8fb56359d485b501031e43b40ba07cd1debff655b5b51bbc62808f2512cbde2f861c8777f185c05b792e8d1ca16a5b60978b675
+EBUILD nspr-4.34.1.ebuild 4865 BLAKE2B 4aa657562d9386fcb4cac872466d1f1f7c224474144440cc947502ab0d3155aedd0bf3fb79628b51f31ad4a8f75d1ed5ea258fc57f2b2f749ba404080a6d8e3c SHA512 d948441898313d428059e37c0ac21cded2ba07a74b6b8137b642a0e8d1f37fc8df110397916e0a45c6ebb70fd9ede3c5c8cf6c95bce7821934c190c6d44482b1
 EBUILD nspr-4.34.ebuild 4860 BLAKE2B 9cc8a8f045aa6f69987d7285927566dcc4578c1a9d16ae52de238462936565459e5f4a5dec655c4fa70dcb95dcdae461464422b10bf54feacaa2676825743520 SHA512 9e3f5aa90aea50e0c3b5e350d841f5c18a1dd41afa5aa80807454f18c339aa3d95b3e717b77fd1747de5c46f0cf118d1f7efe1ea496259d7a053f76e3a19d60c
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.34.1.ebuild b/dev-libs/nspr/nspr-4.34.1.ebuild
index 0fe881b0b6b4..b8b31eab2c63 100644
--- a/dev-libs/nspr/nspr-4.34.1.ebuild
+++ b/dev-libs/nspr/nspr-4.34.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index f08d170a5073..8ddc12676a7d 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -4,4 +4,5 @@ DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c139141
 DIST quazip-1.3.tar.gz 156138 BLAKE2B a9002bdfab39fc1516160b0073fd3d59a65a66eda98240b9a2936d4423b21b40dd9360122950a54dc18236bc2aaf4e1e2d761ba145f6dbd5014cf72a287fbb3b SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2
 EBUILD quazip-1.2.ebuild 941 BLAKE2B fdfbd8cc0cb2a17409081c4de485bd573a1ff3145778c71d57e618dcf860638b8bc85923a624e3ef36b1f865b576c65183ed82229dc0cd378f159372b8c80fb6 SHA512 bde570eb2fd7d7944db9cad35fe888044c26c602ddbf31ce4782161e85620db781b46ba951d499519409a00464fdcb84e63c4e6c1e76818ad886fced3fddf46c
 EBUILD quazip-1.3-r1.ebuild 1023 BLAKE2B 6986e760270d297676a5107002e8501455576a42037bc249cf7514b07740211123a132a072b4f38d1e921096ff453def319cdcf762c8471f4dc748aada648ccd SHA512 94b53a3e7c4e867638543692b635e7061f21a33f3297173f8984c84d9efa231ee5529f0c9882764cd89d193381c2745aa5534e3eff986162c4b6f99c742079f2
-MISC metadata.xml 348 BLAKE2B 756252686a3a4888fa4466e59594dc39bd40675d1a9b4b98124ec014d6fdaa14ad5dfd0659712fe5c2e7d338753d7b101fa3183831964764f68e67bb7b950ac7 SHA512 e10894c3e476992491b0692fcce8091450deee9782c7b580e2b956276b000a851844f9a0c408708c9508be607e3744be4f6849162ee362ac818a2e6ad05eb9a7
+EBUILD quazip-1.3-r2.ebuild 1677 BLAKE2B 52b3a50ac95aef213abd8c6f0fb488f075c293129ee0fe64be32fec8b7ba00a5d7c486d8581dd41fd335cf20bcade494dc61ec0cf6caee6f9b2e41d6f8759591 SHA512 223af8dac99ca3fd08989b8e832284b928eba1710feec18310a6117f5df818ff4d721b8a835d8f8e44aed49c8338a33f41f446a0359d935845f77c12e0121ab7
+MISC metadata.xml 461 BLAKE2B 24ee9745d2baa54233f3cea1e7ec426e83ddbf458e63e679f204014ba4d8dd971c0da5876db9adf2b41fbda1239ff89752eebd30fe6a8da179f34274501507cc SHA512 d6d54cd6e2a16ab151dc987dd75772d996f733f7e5212cce7a73d9ed2b75721230b9295476bf6c5680343e9ce02cfafa7d2b667afc5597d770c66c96a8474956
diff --git a/dev-libs/quazip/metadata.xml b/dev-libs/quazip/metadata.xml
index de71837a36e3..c0b0f714ce05 100644
--- a/dev-libs/quazip/metadata.xml
+++ b/dev-libs/quazip/metadata.xml
@@ -8,4 +8,8 @@
 		<remote-id type="github">stachenov/quazip</remote-id>
 		<remote-id type="sourceforge">quazip</remote-id>
 	</upstream>
+	<use>
+		<flag name="qt5">Build with Qt5 support</flag>
+		<flag name="qt6">Build with Qt6 support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/quazip/quazip-1.3-r2.ebuild b/dev-libs/quazip/quazip-1.3-r2.ebuild
new file mode 100644
index 000000000000..9f2752897d51
--- /dev/null
+++ b/dev-libs/quazip/quazip-1.3-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/"
+SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
+SLOT="0/1.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	qt5? ( dev-qt/qtcore:5 )
+	qt6? ( dev-qt/qtbase:6 )
+	sys-libs/zlib[minizip]
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		qt5? (
+			dev-qt/qtnetwork:5
+			dev-qt/qttest:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[gui,network]
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!=dev-libs/quazip-1.1-r0:1
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DBUILD_TESTING=$(usex test)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(
+				-DQUAZIP_QT_MAJOR_VERSION=5
+			)
+		elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
+			mycmakeargs+=(
+				-DQUAZIP_QT_MAJOR_VERSION=6
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	my_src_compile() {
+		cmake_src_compile
+		use test && cmake_build qztest
+	}
+
+	multibuild_foreach_variant my_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant cmake_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}