commit: 6f01d3f4f3ad39ff29ce48f9abb11a20e2c756e5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 26 20:25:15 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Apr 28 17:12:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f01d3f4
app-crypt/qca: Drop IUSE qt5, qt6 from 9999; Qt6-unconditional now Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-crypt/qca/qca-9999.ebuild | 81 +++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 54 deletions(-) diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild index 3b70f4576bc3..8e61f992b897 100644 --- a/app-crypt/qca/qca-9999.ebuild +++ b/app-crypt/qca/qca-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake kde.org multibuild out-of-source-utils qmake-utils +inherit cmake kde.org out-of-source-utils qmake-utils DESCRIPTION="Qt Cryptographic Architecture (QCA)" HOMEPAGE="https://userbase.kde.org/QCA"; @@ -11,12 +11,13 @@ HOMEPAGE="https://userbase.kde.org/QCA"; LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="" -IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 qt5 +qt6 sasl softstore +ssl test" -REQUIRED_USE="|| ( qt5 qt6 )" +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 ) @@ -25,22 +26,11 @@ RDEPEND=" >=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] ) - ) + test? ( dev-qt/qtbase:6[network] ) " BDEPEND=" virtual/pkgconfig @@ -56,57 +46,40 @@ 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 + 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() { - multibuild_foreach_variant cmake_src_compile - if use doc; then - multibuild_for_best_variant cmake_build doc - fi + cmake_src_compile + use doc && cmake_build doc } src_test() { - mytest() { - local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake_src_test - } - multibuild_foreach_variant mytest + local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" + cmake_src_test } src_install() { - multibuild_foreach_variant cmake_src_install + cmake_src_install if use doc; then - multibuild_for_best_variant run_in_build_dir dodoc -r apidocs/html + run_in_build_dir dodoc -r apidocs/html fi if use examples; then
