gentoo auto-resync : 03:08:2023 - 22:54:30

6 files changed, 91 insertions, 205 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b99b2f05f0a1..2a9bf596362a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 5dd4487d61da..4bbcd2a8c840 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,8 +1,5 @@
 AUX qca-2.3.7-use-sha256-not-sha1.patch 900 BLAKE2B cb801afc80c5bb6abeab3b283b491a6f7e1a3f6d4a60e63c479571b7b5d5871b57c08a727f627d48e61cf1470689586a38d258fbb3f536136369d12cace4552f SHA512 da1c4562fd6d1fbe818a5804707e3349c47ec14d1c603bd89dca7ecc4fd73baf72cece34fe684afcfeb934f300f67413c487835d0692bc787f4583893c09917e
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
-DIST qca-2.3.6.tar.xz 745864 BLAKE2B a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8 SHA512 018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c
 DIST qca-2.3.7.tar.xz 745880 BLAKE2B 87a029a3cca93f14c764a105e8f0b3c2a32a39ab16ea34e60fe155712ecd351dcb8d67659228ad339db7e3b572ce8ca9c50b9cdc2a5bf8511b482329497843ee SHA512 8932c3ea82378cacd408f787dbfd38a5ffe7a9a5e4c90a53a44b9a386c827f70b19094d4188d5ace8dc0a9c84caa4b242aa85967ef5948591e8d74d7cf3109f6
-EBUILD qca-2.3.6-r1.ebuild 1878 BLAKE2B eb333c51e31bbf7df91e267c2e6786201645ff73d4d747dface11905e9c354ac6cf31d3185fed58a48589881e7872acf0490d3bbea30dc807ebfbddbcdcd2a43 SHA512 b40d18b16b398dc45f69949e4c30c2d0e02ae97cbcfa6e59f36a4b22b63ede50c27dd7c66cd5fe533d227e988ea00522910c6e87d2a01323794f4d1d13cec9dc
-EBUILD qca-2.3.6-r2.ebuild 2550 BLAKE2B d87cb78dbf2260c082d4e8afabf7b77019e8ef75cbb80bc0fb8abd42981b709757c9432d38dfffaab8731a2a0721140d48088a8547397cab36956d57fe1ccee2 SHA512 ed4ca01439c5a4603e0db58ec29eee9d343f265fa808e2be14684efcf0f0ab85ca0ec8b0717b1d93d28998bc6bf5015103b7b70260293c3c441856d02271666d
 EBUILD qca-2.3.7.ebuild 2607 BLAKE2B 9717d3c08a565f1ceab2bdf9d72880a93e5a53dd8448da8363e8b94b50dfe8db36ec1ee6fa62700355fb606a1191e2da5ec57c061d899388b88818f8e03b32ee SHA512 682aed8f3ac4c1c28fa25c2a71a94a3299dadb9e2d87fbe2e06538e1c6b781814b6eb8d9c5ad57b9f8ed2b77b7c744d135ef97abf21b343950c492df1f1e3bec
 MISC metadata.xml 832 BLAKE2B 9044b545fa732c5f86c7dbb026630b4946a538ba77369eae28e894bf636ca60f6a31d7aad258fa19aee4c433d6d5a8e2a34a7c2850eef3a40d44261e592032b0 SHA512 b01bfe83343fdc265abc25922300cdc67f556a9a6f6db16918b0b3ee44c4e83db524695c5cb8952278f3e1f2e5d60a49bcc9312b35ab95f0ecc42e03764fb6bd
diff --git a/app-crypt/qca/qca-2.3.6-r1.ebuild b/app-crypt/qca/qca-2.3.6-r1.ebuild
deleted file mode 100644
index 2fa7c3806dbd..000000000000
--- a/app-crypt/qca/qca-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.14:5
-	botan? ( dev-libs/botan:3= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	pkcs11? (
-		>=dev-libs/openssl-1.1
-		dev-libs/pkcs11-helper
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		virtual/latex-base
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
-		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
-		$(qca_plugin_use botan)
-		$(qca_plugin_use gcrypt)
-		$(qca_plugin_use gpg gnupg)
-		$(qca_plugin_use logger)
-		$(qca_plugin_use nss)
-		$(qca_plugin_use pkcs11)
-		$(qca_plugin_use sasl cyrus-sasl)
-		$(qca_plugin_use softstore)
-		$(qca_plugin_use ssl ossl)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
diff --git a/app-crypt/qca/qca-2.3.6-r2.ebuild b/app-crypt/qca/qca-2.3.6-r2.ebuild
deleted file mode 100644
index c87391d21e98..000000000000
--- a/app-crypt/qca/qca-2.3.6-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org multibuild out-of-source-utils qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 +qt5 qt6 sasl softstore +ssl test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	botan? ( dev-libs/botan:3= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	pkcs11? (
-		>=dev-libs/openssl-1.1
-		dev-libs/pkcs11-helper
-	)
-	qt5? ( >=dev-qt/qtcore-5.14:5 )
-	qt6? (
-		dev-qt/qtbase:6
-		dev-qt/qt5compat:6
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		qt5? (
-			dev-qt/qtnetwork:5
-			dev-qt/qttest:5
-		)
-		qt6? ( dev-qt/qtbase:6[network,test] )
-	)
-"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		virtual/latex-base
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
-			-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
-			$(qca_plugin_use botan)
-			$(qca_plugin_use gcrypt)
-			$(qca_plugin_use gpg gnupg)
-			$(qca_plugin_use logger)
-			$(qca_plugin_use nss)
-			$(qca_plugin_use pkcs11)
-			$(qca_plugin_use sasl cyrus-sasl)
-			$(qca_plugin_use softstore)
-			$(qca_plugin_use ssl ossl)
-			-DBUILD_TESTS=$(usex test)
-		)
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-				mycmakeargs+=( -DBUILD_WITH_QT6=ON )
-		else
-				mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-	if use doc; then
-		multibuild_for_best_variant cmake_build doc
-	fi
-}
-
-src_test() {
-	mytest() {
-		local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-		cmake_src_test
-	}
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-
-	if use doc; then
-		multibuild_for_best_variant run_in_build_dir dodoc -r apidocs/html
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index e5b40ce32c4f..513daa5091d6 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,3 +1,5 @@
 DIST rhash-1.4.3-src.tar.gz 429290 BLAKE2B d225aeae0b3a8fb2e093a9aef50cd07a790c7e9734e91114deef2ca8492c85261b8ed5dea45958e35e049ea888885175608962ea72297bdef48b00c52f51eaca SHA512 d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7
+DIST rhash-1.4.4-src.tar.gz 435691 BLAKE2B f3d42f333ad9a82fe4a8ef5af5d8008abf526c05c06a00c7033881d5a27ba663c3cc5cefb73ea8157ac24cb10a50a4e500706d489e61a03dbaee74a4735d1722 SHA512 00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f
 EBUILD rhash-1.4.3.ebuild 2113 BLAKE2B 2462ca1adacaedcfe7352553356498ba501ecf184c79ff64c29ee40b88d987ef1e45da8987f17c33d7e8cd40fa244e81fd41d1c91aa9fb3f8da49c06ed72aa85 SHA512 f2192895a9ae0195f403e1feddce71a10df7105765892a09f219614b2be50b9f20205baadf5f6ce32997d56ad5fed733e839fb5493f76423d8329c9be3d66763
+EBUILD rhash-1.4.4.ebuild 2123 BLAKE2B 8454517f2b450206ca0554e42060b60beefe5cd9dc5652225f7b2c693e4070992423bc8a7fdfb928c95887e3c255b8431d2aff5dada17f678a456777168944c1 SHA512 c913d14374c69a4d3c8f1ae056f1c82d88331444885d70547e6effad2473e7a278bc635ff86d7798b7a0c4ce278d24daf73ef9e9ab70721a194aa632873d6d1c
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/rhash-1.4.4.ebuild b/app-crypt/rhash/rhash-1.4.4.ebuild
new file mode 100644
index 000000000000..7992769880b4
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.4.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Console utility and library for computing and verifying file hash sums"
+HOMEPAGE="http://rhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug nls ssl static-libs"
+
+RDEPEND="
+	ssl? (
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+)"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/RHash-${PV}"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
+		# we lack posix_memalign
+		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
+			librhash/util.h || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
+	set -- \
+		./configure \
+		--target="${CHOST}" \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-openssl-runtime \
+		--disable-static \
+		--enable-lib-shared \
+		$(use_enable debug) \
+		$(use_enable nls gettext) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs lib-static)
+
+	echo "${@}"
+	"${@}" || die "configure failed"
+}
+
+multilib_src_compile() {
+	emake all \
+		$(multilib_is_native_abi && use nls && echo compile-gmo)
+}
+
+multilib_src_install() {
+	# -j1 needed due to race condition.
+	emake DESTDIR="${D}" -j1 \
+		install{,-lib-headers,-pkg-config} \
+		$(multilib_is_native_abi && use nls && echo install-gmo) \
+		install-lib-so-link
+}
+
+multilib_src_test() {
+	emake test
+}