commit:     1c4c7d3c1b71d98b85cd03ab2605e9647f833dbc
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue May 13 13:53:23 2025 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Tue May 13 13:57:18 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1c4c7d3c

app-crypt/qca: add 2.3.10-r1, drop 2.3.10

Closes: https://github.com/gentoo/libressl/issues/592
Signed-off-by: orbea <orbea <AT> riseup.net>

 app-crypt/qca/qca-2.3.10-r1.ebuild |  92 ++++++++++++++++++++++++++++
 app-crypt/qca/qca-2.3.10.ebuild    | 119 -------------------------------------
 2 files changed, 92 insertions(+), 119 deletions(-)

diff --git a/app-crypt/qca/qca-2.3.10-r1.ebuild 
b/app-crypt/qca/qca-2.3.10-r1.ebuild
new file mode 100644
index 0000000..59e28eb
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.10-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake kde.org 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 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore 
+ssl test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       dev-qt/qt5compat:6
+       dev-qt/qtbase:6
+       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/qtbase:6[network] )
+"
+BDEPEND="
+       virtual/pkgconfig
+       doc? (
+               app-text/doxygen[dot]
+               virtual/latex-base
+       )
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.3.4-libressl.patch"
+       "${FILESDIR}/${PN}-disable-pgp-test.patch"
+)
+
+qca_plugin_use() {
+       echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DBUILD_WITH_QT6=ON
+               
-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt6_get_mkspecsdir)/features"
+               -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt6_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_compile() {
+       cmake_src_compile
+       use doc && cmake_build doc
+}
+
+src_test() {
+       local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+       cmake_src_test
+}
+
+src_install() {
+       cmake_src_install
+
+       if use doc; then
+               run_in_build_dir dodoc -r apidocs/html
+       fi
+
+       if use examples; then
+               dodoc -r "${S}"/examples
+       fi
+}

diff --git a/app-crypt/qca/qca-2.3.10.ebuild b/app-crypt/qca/qca-2.3.10.ebuild
deleted file mode 100644
index c17c5b5..0000000
--- a/app-crypt/qca/qca-2.3.10.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2025 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 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-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 )
-       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] )
-       )
-"
-BDEPEND="
-       virtual/pkgconfig
-       doc? (
-               app-text/doxygen[dot]
-               virtual/latex-base
-       )
-"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-2.3.4-libressl.patch"
-       "${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
-}

Reply via email to