commit: bc28307774401dab146d2c7d2ec86472bbba2c06 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 18 17:58:19 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 18 17:58:19 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc283077
app-crypt/qca: Merge 2.3.6-r2 into 9999 as it should have been Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-crypt/qca/qca-2.3.6-r2.ebuild | 115 -------------------------------------- app-crypt/qca/qca-9999.ebuild | 10 ++-- 2 files changed, 5 insertions(+), 120 deletions(-) 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 c87391d2..00000000 --- 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/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild index 7d7741c9..881f0f1c 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 qmake-utils +inherit cmake kde.org multibuild out-of-source-utils qmake-utils DESCRIPTION="Qt Cryptographic Architecture (QCA)" HOMEPAGE="https://userbase.kde.org/QCA"; @@ -88,6 +88,9 @@ src_configure() { src_compile() { multibuild_foreach_variant cmake_src_compile + if use doc; then + multibuild_for_best_variant cmake_build doc + fi } src_test() { @@ -102,10 +105,7 @@ src_install() { multibuild_foreach_variant cmake_src_install if use doc; then - pushd "${BUILD_DIR}" >/dev/null || die - doxygen Doxyfile || die - dodoc -r apidocs/html - popd >/dev/null || die + multibuild_for_best_variant run_in_build_dir dodoc -r apidocs/html fi if use examples; then
