[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 66b79076d751ae29fc30bda9189b82712532dfe7 Author: Sam James gentoo org> AuthorDate: Sat Jan 13 16:45:13 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jan 13 16:45:13 2024 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=66b79076 app-crypt/qca: app-doc/doxygen -> app-text/doxygen Signed-off-by: Sam James gentoo.org> app-crypt/qca/qca-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 881f0f1c..1315314c 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -44,7 +44,7 @@ DEPEND="${RDEPEND} " BDEPEND=" doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] virtual/latex-base ) "
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: bc28307774401dab146d2c7d2ec86472bbba2c06 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 18 17:58:19 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 18 17:58:19 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc283077 app-crypt/qca: Merge 2.3.6-r2 into as it should have been Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-2.3.6-r2.ebuild | 115 -- app-crypt/qca/qca-.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.. --- 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-.ebuild b/app-crypt/qca/qca-.ebuild index 7d7741c9..881f0f1c 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.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
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: d1974599f53961535e9b723fa74b80fa70a38224 Author: Thomas Bettler gmail com> AuthorDate: Sun Jun 11 08:56:21 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 18 15:32:08 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d1974599 app-crypt/qca: add Qt6 support Signed-off-by: Thomas Bettler gmail.com> Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-2.3.6-r2.ebuild | 115 ++ 1 file changed, 115 insertions(+) diff --git a/app-crypt/qca/qca-2.3.6-r2.ebuild b/app-crypt/qca/qca-2.3.6-r2.ebuild new file mode 100644 index ..0cdc05cd --- /dev/null +++ b/app-crypt/qca/qca-2.3.6-r2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake kde.org multibuild 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 +} + +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 + 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 +}
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 045424c12c2c2936e622d65ae124d161795cd211 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 18 15:20:05 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 18 15:32:22 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=045424c1 app-crypt/qca: Fix build with USE=doc Thanks-to: Thomas Bettler gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31427 Closes: https://bugs.gentoo.org/908454 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-2.3.6-r2.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app-crypt/qca/qca-2.3.6-r2.ebuild b/app-crypt/qca/qca-2.3.6-r2.ebuild index 0cdc05cd..c87391d2 100644 --- a/app-crypt/qca/qca-2.3.6-r2.ebuild +++ b/app-crypt/qca/qca-2.3.6-r2.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; @@ -89,6 +89,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() { @@ -103,10 +106,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
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 8ad75e24d5aefbbed8ca48ef0e5760a58feef50b Author: Sam James gentoo org> AuthorDate: Thu May 4 02:36:22 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 13 12:16:16 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8ad75e24 app-crypt/qca: use botan:3 Supports both botan:2 and botan:3 but obviously we prefer the newer slot. Build system logic prefers 3 > 2 so no need for more complicated handling like patching one out. Signed-off-by: Sam James gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index f222167a..7d7741c9 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ REQUIRED_USE="|| ( qt5 qt6 )" RESTRICT="!test? ( test )" RDEPEND=" - botan? ( dev-libs/botan:2= ) + botan? ( dev-libs/botan:3= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss )
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 60ef0f1ebc3a9b9b05ec431ce64146e4e2774849 Author: Sam James gentoo org> AuthorDate: Wed Apr 12 02:19:50 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 12 02:20:52 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=60ef0f1e app-crypt/qca: specify botan slot Botan 3 is now in tree. Signed-off-by: Sam James gentoo.org> app-crypt/qca/qca-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 7505274f..f222167a 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE="|| ( qt5 qt6 )" RESTRICT="!test? ( test )" RDEPEND=" - botan? ( dev-libs/botan:= ) + botan? ( dev-libs/botan:2= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss )
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 4e458e7b27d1181e24da916c77539d67de8fe045 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 11 16:16:12 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 11 16:16:12 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4e458e7b app-crypt/qca: Set +qt5 default for REQUIRED_USE Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 492d5b29..7505274f 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -11,7 +11,7 @@ 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" +IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 +qt5 qt6 sasl softstore +ssl test" REQUIRED_USE="|| ( qt5 qt6 )" RESTRICT="!test? ( test )"
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 18bbf0c4c9b94e3c41fc91a7c67a772737d9257c Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 11 15:56:17 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 11 15:56:17 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=18bbf0c4 app-crypt/qca: Add IUSE qt6 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-.ebuild | 85 ++- 1 file changed, 59 insertions(+), 26 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index b44a8ff2..492d5b29 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake kde.org qmake-utils +inherit cmake kde.org multibuild qmake-utils DESCRIPTION="Qt Cryptographic Architecture (QCA)" HOMEPAGE="https://userbase.kde.org/QCA; @@ -11,12 +11,12 @@ HOMEPAGE="https://userbase.kde.org/QCA; LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="" -IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test" +IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 qt5 qt6 sasl softstore +ssl test" +REQUIRED_USE="|| ( qt5 qt6 )" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-qt/qtcore-5.14:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) @@ -25,16 +25,29 @@ RDEPEND=" >=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:0= ) + ssl? ( >=dev-libs/openssl-1.1:= ) " DEPEND="${RDEPEND} test? ( - dev-qt/qtnetwork:5 - dev-qt/qttest:5 + 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 ) " -BDEPEND="doc? ( app-doc/doxygen )" PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" ) @@ -42,31 +55,51 @@ qca_plugin_use() { echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") } +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + 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 + 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 } src_test() { - local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake_src_test + mytest() { + local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" + cmake_src_test + } + multibuild_foreach_variant mytest } src_install() { - cmake_src_install + multibuild_foreach_variant cmake_src_install if use doc; then pushd "${BUILD_DIR}" >/dev/null || die
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: bec4eaa82a9ef038679ee01705476eb116752591 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 2 19:51:16 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 2 19:52:16 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bec4eaa8 app-crypt/qca: Drop IUSE=libressl Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-.ebuild | 16 +--- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index a067daa7..39801558 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,13 +11,10 @@ HOMEPAGE="https://userbase.kde.org/QCA; LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="" -IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test" +IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test" RESTRICT="!test? ( test )" -BDEPEND=" - doc? ( app-doc/doxygen ) -" RDEPEND=" dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) @@ -25,15 +22,11 @@ RDEPEND=" gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( - !libressl? ( >=dev-libs/openssl-1.1 ) - libressl? ( dev-libs/libressl ) + >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.1:0= ) - libressl? ( dev-libs/libressl:= ) - ) + ssl? ( >=dev-libs/openssl-1.1:0= ) " DEPEND="${RDEPEND} test? ( @@ -41,6 +34,7 @@ DEPEND="${RDEPEND} dev-qt/qttest:5 ) " +BDEPEND="doc? ( app-doc/doxygen )" PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: df751b5d855155bebc9653aa8966afcb146745e4 Author: Mikle Kolyada gentoo org> AuthorDate: Wed Jan 8 19:51:27 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 2 19:51:58 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=df751b5d app-crypt/qca: reassign crypto@ packages Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml index 07b5287c..c732661f 100644 --- a/app-crypt/qca/metadata.xml +++ b/app-crypt/qca/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - cry...@gentoo.org - Crypto - q...@gentoo.org Gentoo Qt Project
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 95ccc0dd616df4d0b53d6bc152c5ad7fcb7e5c04 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 11 15:37:16 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 11 15:38:36 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=95ccc0dd app-crypt/qca: Raise minimum dev-libs/openssl to >=1.1 Upstream commit 001f827a4fc4475d8489f662df588e68423e0e2a Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-.ebuild | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index be322031..a067daa7 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,6 @@ HOMEPAGE="https://userbase.kde.org/QCA; LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="" - IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test" RESTRICT="!test? ( test )" @@ -26,13 +25,13 @@ RDEPEND=" gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( - !libressl? ( dev-libs/openssl:0 ) + !libressl? ( >=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1:0= ) + !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) "
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: d2c703851941eb94c809b43c51f0f0628ba84044 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 31 16:39:50 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 31 16:39:58 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d2c70385 app-crypt/qca: Switch to cmake.eclass and kde.org.eclass Add missing RESTRICT="!test? ( test )" Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-.ebuild | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 3c88d034..be322031 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -3,11 +3,10 @@ EAPI=7 -inherit cmake-utils git-r3 qmake-utils +inherit kde.org cmake git-r3 qmake-utils DESCRIPTION="Qt Cryptographic Architecture (QCA)" HOMEPAGE="https://userbase.kde.org/QCA; -EGIT_REPO_URI="https://anongit.kde.org/${PN}.git; LICENSE="LGPL-2.1" SLOT="2" @@ -15,6 +14,8 @@ KEYWORDS="" IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test" +RESTRICT="!test? ( test )" + BDEPEND=" doc? ( app-doc/doxygen ) " @@ -63,16 +64,16 @@ src_configure() { $(qca_plugin_use ssl ossl) -DBUILD_TESTS=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } src_test() { local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake-utils_src_test + cmake_src_test } src_install() { - cmake-utils_src_install + cmake_src_install if use doc; then pushd "${BUILD_DIR}" >/dev/null || die
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 0b8e28b5fa5c84388660ab1422d7d7cd3311eec2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 26 16:08:20 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 26 16:08:20 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0b8e28b5 app-crypt/qca: EAPI-7 bump Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/qca-.ebuild | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 25920235..3c88d034 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils git-r3 qmake-utils @@ -15,6 +15,9 @@ KEYWORDS="" IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test" +BDEPEND=" + doc? ( app-doc/doxygen ) +" RDEPEND=" dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) @@ -33,7 +36,6 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 8400d20519318cbd8a3ff4cf05783c921d7a84de Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Jun 12 15:53:36 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 12 16:03:56 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8400d205 app-crypt/qca: Sync with tree Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-crypt/qca/qca-.ebuild | 22 -- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 6bf24ba2..25920235 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit cmake-utils qmake-utils git-r3 +inherit cmake-utils git-r3 qmake-utils DESCRIPTION="Qt Cryptographic Architecture (QCA)" HOMEPAGE="https://userbase.kde.org/QCA; @@ -15,7 +15,7 @@ KEYWORDS="" IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test" -COMMON_DEPEND=" +RDEPEND=" dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) @@ -32,18 +32,12 @@ COMMON_DEPEND=" libressl? ( dev-libs/libressl:= ) ) " -DEPEND="${COMMON_DEPEND} - dev-qt/qtnetwork:5 - virtual/pkgconfig +DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) - test? ( dev-qt/qttest:5 ) -" -RDEPEND="${COMMON_DEPEND} - !app-crypt/qca-cyrus-sasl - !app-crypt/qca-gnupg - !app-crypt/qca-logger - !app-crypt/qca-ossl - !app-crypt/qca-pkcs11 + test? ( + dev-qt/qtnetwork:5 + dev-qt/qttest:5 + ) " PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" ) @@ -80,7 +74,7 @@ src_install() { if use doc; then pushd "${BUILD_DIR}" >/dev/null || die - doxygen Doxyfile.in || die + doxygen Doxyfile || die dodoc -r apidocs/html popd >/dev/null || die fi
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: df8482fecd5efc06dd4b2afe799865edd41a21c0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 11 20:21:57 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 11 20:22:03 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=df8482fe app-crypt/qca: Sync with Gentoo ebuild repo, drop USE=qt4,qt5 Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-crypt/qca/qca-.ebuild | 95 +++ 1 file changed, 33 insertions(+), 62 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index e54b7947..d479c851 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils multibuild qmake-utils git-r3 +inherit cmake-utils qmake-utils git-r3 DESCRIPTION="Qt Cryptographic Architecture (QCA)" HOMEPAGE="https://userbase.kde.org/QCA; @@ -13,15 +13,10 @@ LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="" -IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test" -REQUIRED_USE="|| ( qt4 qt5 )" +IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test" -RDEPEND=" - !app-crypt/qca-cyrus-sasl - !app-crypt/qca-gnupg - !app-crypt/qca-logger - !app-crypt/qca-ossl - !app-crypt/qca-pkcs11 +COMMON_DEPEND=" + dev-qt/qtcore:5 botan? ( dev-libs/botan:0 ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) @@ -31,27 +26,24 @@ RDEPEND=" libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) - qt4? ( dev-qt/qtcore:4 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtnetwork:5 - ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} + dev-qt/qtnetwork:5 doc? ( app-doc/doxygen ) - test? ( - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) + test? ( dev-qt/qttest:5 ) +" +RDEPEND="${COMMON_DEPEND} + !app-crypt/qca-cyrus-sasl + !app-crypt/qca-gnupg + !app-crypt/qca-logger + !app-crypt/qca-ossl + !app-crypt/qca-pkcs11 " - -DOCS=( README TODO ) PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" ) @@ -59,52 +51,31 @@ qca_plugin_use() { echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") } -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - 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} == qt4 ]]; then - mycmakeargs+=(-DQT4_BUILD=ON) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile + 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-utils_src_configure } src_test() { - mytest() { - local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake-utils_src_test - } - - multibuild_foreach_variant mytest + local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" + cmake-utils_src_test } src_install() { - multibuild_foreach_variant
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 3b54ba56fa9fb4b8b169e6353d02e04d256f95b0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 11 23:09:35 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 11 23:09:35 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3b54ba56 app-crypt/qca: Switch EGIT_REPO_URI to https Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-crypt/qca/qca-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 1dede5f2..6bf24ba2 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -7,7 +7,7 @@ inherit cmake-utils qmake-utils git-r3 DESCRIPTION="Qt Cryptographic Architecture (QCA)" HOMEPAGE="https://userbase.kde.org/QCA; -EGIT_REPO_URI=("git://anongit.kde.org/${PN}.git") +EGIT_REPO_URI="https://anongit.kde.org/${PN}.git; LICENSE="LGPL-2.1" SLOT="2"
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 0253a6b0bc2510ba261695ac2366d6b427197327 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 11 20:31:46 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 11 20:31:46 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0253a6b0 app-crypt/qca: Support botan2 Upstream commit 47163784d74232e3a844fc42897bffc7eff817b4 Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-crypt/qca/qca-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index d479c851..1dede5f2 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -17,7 +17,7 @@ IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softst COMMON_DEPEND=" dev-qt/qtcore:5 - botan? ( dev-libs/botan:0 ) + botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) @@ -34,6 +34,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-qt/qtnetwork:5 + virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-qt/qttest:5 ) "
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 595bf99f46dfad8b28101e8db2e662a573fb98d8 Author: Michael Palimaka gentoo org> AuthorDate: Tue Apr 25 11:36:00 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Apr 25 11:36:04 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=595bf99f app-crypt/qca: pin dev-libs/botan to SLOT 0 Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-crypt/qca/qca-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 008c65e9..e54b7947 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -22,7 +22,7 @@ RDEPEND=" !app-crypt/qca-logger !app-crypt/qca-ossl !app-crypt/qca-pkcs11 - botan? ( dev-libs/botan ) + botan? ( dev-libs/botan:0 ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss )
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 7f97fbe749a23d25729da8bcda4676a8c83b3072 Author: Michael Palimaka gentoo org> AuthorDate: Tue Apr 25 11:31:38 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Apr 25 11:32:18 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7f97fbe7 app-crypt/qca: update $HOMEPAGE Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-crypt/qca/qca-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index f96fe207..008c65e9 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit cmake-utils multibuild qmake-utils git-r3 DESCRIPTION="Qt Cryptographic Architecture (QCA)" -HOMEPAGE="http://delta.affinix.com/qca/; +HOMEPAGE="https://userbase.kde.org/QCA; EGIT_REPO_URI=("git://anongit.kde.org/${PN}.git") LICENSE="LGPL-2.1"
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 0590b7f4e1f14adcee7a6698e89b6ef14c0a58bd Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 28 15:18:59 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 28 15:19:09 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0590b7f4 app-crypt/qca: sync with main tree Package-Manager: portage-2.3.2 app-crypt/qca/metadata.xml| 1 - app-crypt/qca/qca-.ebuild | 16 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml index 85f20ae..07b5287 100644 --- a/app-crypt/qca/metadata.xml +++ b/app-crypt/qca/metadata.xml @@ -19,7 +19,6 @@ Enable GnuPG plugin Enable logger plugin Enable NSS plugin - Enable OpenSSL plugin Enable PKCS#11 plugin Enable SASL plugin Enable softstore plugin diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index bea5a3b..6924f77 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit cmake-utils multibuild qmake-utils git-r3 @@ -14,7 +14,7 @@ LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="" -IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test" +IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test" REQUIRED_USE="|| ( qt4 qt5 )" RDEPEND=" @@ -27,9 +27,9 @@ RDEPEND=" gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) - openssl? ( dev-libs/openssl:0 ) pkcs11? ( - dev-libs/openssl:0 + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) qt4? ( dev-qt/qtcore:4 ) @@ -39,6 +39,10 @@ RDEPEND=" dev-qt/qtnetwork:5 ) sasl? ( dev-libs/cyrus-sasl:2 ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1:0= ) + libressl? ( dev-libs/libressl:= ) + ) " DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) @@ -70,11 +74,11 @@ src_configure() { $(qca_plugin_use gpg gnupg) $(qca_plugin_use logger) $(qca_plugin_use nss) - $(qca_plugin_use openssl ossl) $(qca_plugin_use pkcs11) $(qca_plugin_use sasl cyrus-sasl) $(qca_plugin_use softstore) - $(cmake-utils_use_build test TESTS) + $(qca_plugin_use ssl ossl) + -DBUILD_TESTS=$(usex test) ) if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 2201d9297b858a9eacd0bfed524fa9ed89c0488b Author: Davide Pesavento pesa AT gentoo DOT org AuthorDate: Tue Jun 30 21:47:32 2015 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Tue Jun 30 21:47:32 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2201d929 [app-crypt/qca] Sync. Package-Manager: portage-2.2.20 app-crypt/qca/qca-.ebuild | 37 +++-- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index b8498a1..8174e3e 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -4,14 +4,11 @@ EAPI=5 -# for multibuild support, until merged to master -EGIT_BRANCH=qt5 - -inherit multilib cmake-utils multibuild git-r3 +inherit cmake-utils multibuild qmake-utils git-r3 DESCRIPTION=Qt Cryptographic Architecture (QCA) HOMEPAGE=http://delta.affinix.com/qca/; -EGIT_REPO_URI=git://anongit.kde.org/${PN} +EGIT_REPO_URI=(git://anongit.kde.org/${PN}.git) LICENSE=LGPL-2.1 SLOT=2 @@ -56,7 +53,7 @@ DOCS=( README TODO ) PATCHES=( ${FILESDIR}/${PN}-disable-pgp-test.patch ) qca_plugin_use() { - echo -DWITH_${2:-$1}_PLUGIN=$(use $1 echo yes || echo no) + echo -DWITH_${2:-$1}_PLUGIN=$(usex $1) } pkg_setup() { @@ -66,6 +63,8 @@ pkg_setup() { 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) @@ -78,19 +77,8 @@ src_configure() { $(cmake-utils_use_build test TESTS) ) - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=( - -DQT4_BUILD=ON - -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt4/plugins - -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/share/qt4/mkspecs/features - ) - fi - - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=( - -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt5/plugins - -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs/features - ) + if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then + mycmakeargs+=(-DQT4_BUILD=ON) fi cmake-utils_src_configure @@ -104,17 +92,22 @@ src_compile() { } src_test() { - multibuild_foreach_variant cmake-utils_src_test + mytest() { + local -x QCA_PLUGIN_PATH=${BUILD_DIR}/lib/qca + cmake-utils_src_test + } + + multibuild_foreach_variant mytest } src_install() { multibuild_foreach_variant cmake-utils_src_install if use doc; then - pushd ${BUILD_DIR} /dev/null + pushd ${BUILD_DIR} /dev/null || die doxygen Doxyfile.in || die dodoc -r apidocs/html - popd /dev/null + popd /dev/null || die fi if use examples; then
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 09db2b90040b19ddd20bd76357d2b5daed3ba00b Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Wed Mar 4 07:55:20 2015 + Commit: git@oystercatcher mirror+tproxy git AT oystercatcher DOT gentoo DOT org CommitDate: Wed Mar 4 07:55:20 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=09db2b90 [app-crypt/qca] Pull in OpenSSL plugin by default. Package-Manager: portage-2.2.17 app-crypt/qca/qca-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 54ed4b8..b8498a1 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -17,7 +17,7 @@ LICENSE=LGPL-2.1 SLOT=2 KEYWORDS= -IUSE=botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test +IUSE=botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test REQUIRED_USE=|| ( qt4 qt5 ) RDEPEND=
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 09db2b90040b19ddd20bd76357d2b5daed3ba00b Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Wed Mar 4 07:55:20 2015 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Wed Mar 4 07:55:20 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=09db2b90 [app-crypt/qca] Pull in OpenSSL plugin by default. Package-Manager: portage-2.2.17 app-crypt/qca/qca-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 54ed4b8..b8498a1 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -17,7 +17,7 @@ LICENSE=LGPL-2.1 SLOT=2 KEYWORDS= -IUSE=botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test +IUSE=botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test REQUIRED_USE=|| ( qt4 qt5 ) RDEPEND=
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 9ed67473bad35fca5c6dac9f672af70c1a04e055 Author: Davide Pesavento pesa AT gentoo DOT org AuthorDate: Thu Jan 29 00:26:46 2015 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Thu Jan 29 00:26:46 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9ed67473 [app-crypt/qca] Minor cleanup. Package-Manager: portage-2.2.15 --- app-crypt/qca/qca-.ebuild | 27 +-- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 2d7f1d4..54ed4b8 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -4,8 +4,9 @@ EAPI=5 -# for mulibuild support, until merged to master +# for multibuild support, until merged to master EGIT_BRANCH=qt5 + inherit multilib cmake-utils multibuild git-r3 DESCRIPTION=Qt Cryptographic Architecture (QCA) @@ -59,14 +60,7 @@ qca_plugin_use() { } pkg_setup() { - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=(qt4) - fi - - if use qt5; then - MULTIBUILD_VARIANTS+=(qt5) - fi + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } src_configure() { @@ -109,24 +103,21 @@ src_compile() { multibuild_foreach_variant cmake-utils_src_compile } +src_test() { + multibuild_foreach_variant cmake-utils_src_test +} + src_install() { multibuild_foreach_variant cmake-utils_src_install if use doc; then pushd ${BUILD_DIR} /dev/null doxygen Doxyfile.in || die - dohtml apidocs/html/* + dodoc -r apidocs/html popd /dev/null fi if use examples; then - insinto /usr/share/doc/${PF} - doins -r ${S}/examples + dodoc -r ${S}/examples fi - - cmake-utils_src_install -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test }
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/files/, app-crypt/qca/
commit: e4d722445edfea16ba9c99844304ce72e40b3794 Author: Johannes Huber johu AT gentoo DOT org AuthorDate: Wed Jan 28 01:12:39 2015 + Commit: Johannes Huber johu AT gentoo DOT org CommitDate: Wed Jan 28 01:12:39 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e4d72244 [app-crypt/qca] Sync with tree Package-Manager: portage-2.2.15 --- app-crypt/qca/files/qca-disable-pgp-test.patch | 13 app-crypt/qca/qca-.ebuild | 86 +++--- 2 files changed, 77 insertions(+), 22 deletions(-) diff --git a/app-crypt/qca/files/qca-disable-pgp-test.patch b/app-crypt/qca/files/qca-disable-pgp-test.patch new file mode 100644 index 000..7944e3c --- /dev/null +++ b/app-crypt/qca/files/qca-disable-pgp-test.patch @@ -0,0 +1,13 @@ +diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt +index f4d9eb9..67ef281 100644 +--- a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt +@@ -23,7 +23,7 @@ add_subdirectory(keylengthunittest) + add_subdirectory(keystore) + add_subdirectory(macunittest) + add_subdirectory(metatype) +-add_subdirectory(pgpunittest) ++# add_subdirectory(pgpunittest) + add_subdirectory(pipeunittest) + add_subdirectory(pkits) + add_subdirectory(rsaunittest) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 8e313ba..2d7f1d4 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 -inherit multilib cmake-utils git-r3 +# for mulibuild support, until merged to master +EGIT_BRANCH=qt5 +inherit multilib cmake-utils multibuild git-r3 DESCRIPTION=Qt Cryptographic Architecture (QCA) HOMEPAGE=http://delta.affinix.com/qca/; -EGIT_REPO_URI=git://anongit.kde.org/${PN}.git +EGIT_REPO_URI=git://anongit.kde.org/${PN} LICENSE=LGPL-2.1 SLOT=2 KEYWORDS= IUSE=botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test -REQUIRED_USE=^^ ( qt4 qt5 ) +REQUIRED_USE=|| ( qt4 qt5 ) RDEPEND= !app-crypt/qca-cyrus-sasl @@ -50,35 +52,69 @@ DEPEND=${RDEPEND} DOCS=( README TODO ) +PATCHES=( ${FILESDIR}/${PN}-disable-pgp-test.patch ) + qca_plugin_use() { echo -DWITH_${2:-$1}_PLUGIN=$(use $1 echo yes || echo no) } +pkg_setup() { + MULTIBUILD_VARIANTS=() + if use qt4; then + MULTIBUILD_VARIANTS+=(qt4) + fi + + if use qt5; then + MULTIBUILD_VARIANTS+=(qt5) + fi +} + src_configure() { - local mycmakeargs=( - -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins - -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features - $(cmake-utils_use qt4 QT4_BUILD) - $(qca_plugin_use botan) - $(qca_plugin_use gcrypt) - $(qca_plugin_use gpg gnupg) - $(qca_plugin_use logger) - $(qca_plugin_use nss) - $(qca_plugin_use openssl ossl) - $(qca_plugin_use pkcs11) - $(qca_plugin_use sasl cyrus-sasl) - $(qca_plugin_use softstore) - $(cmake-utils_use_build test TESTS) - ) - cmake-utils_src_configure + myconfigure() { + local mycmakeargs=( + $(qca_plugin_use botan) + $(qca_plugin_use gcrypt) + $(qca_plugin_use gpg gnupg) + $(qca_plugin_use logger) + $(qca_plugin_use nss) + $(qca_plugin_use openssl ossl) + $(qca_plugin_use pkcs11) + $(qca_plugin_use sasl cyrus-sasl) + $(qca_plugin_use softstore) + $(cmake-utils_use_build test TESTS) + ) + + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then + mycmakeargs+=( + -DQT4_BUILD=ON + -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt4/plugins + -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/share/qt4/mkspecs/features + ) + fi + + if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then + mycmakeargs+=( + -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt5/plugins + -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs/features + ) + fi + + cmake-utils_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile }
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: cc8ba815b9c164ddd86eef822e09a34aed946e2c Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Tue Dec 2 15:48:27 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Tue Dec 2 15:50:32 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cc8ba815 [app-crypt/qca] Revert multibuild prefix for now since it breaks consumers. --- app-crypt/qca/qca-.ebuild | 82 --- 1 file changed, 23 insertions(+), 59 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 9095c40..8e313ba 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-utils multilib multibuild git-r3 +inherit multilib cmake-utils git-r3 DESCRIPTION=Qt Cryptographic Architecture (QCA) HOMEPAGE=http://delta.affinix.com/qca/; @@ -15,8 +15,7 @@ SLOT=2 KEYWORDS= IUSE=botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test - -REQUIRED_USE=|| ( qt4 qt5 ) +REQUIRED_USE=^^ ( qt4 qt5 ) RDEPEND= !app-crypt/qca-cyrus-sasl @@ -55,68 +54,33 @@ qca_plugin_use() { echo -DWITH_${2:-$1}_PLUGIN=$(use $1 echo yes || echo no) } -pkg_setup() { - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=( qt4 ) - fi - if use qt5; then - MULTIBUILD_VARIANTS+=( qt5 ) - fi -} - src_configure() { - myconfigure() { - local mycmakeargs=( - -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins - -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features - $(qca_plugin_use botan) - $(qca_plugin_use gcrypt) - $(qca_plugin_use gpg gnupg) - $(qca_plugin_use logger) - $(qca_plugin_use nss) - $(qca_plugin_use openssl ossl) - $(qca_plugin_use pkcs11) - $(qca_plugin_use sasl cyrus-sasl) - $(qca_plugin_use softstore) - $(cmake-utils_use_build test TESTS) - ) - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=( -DQT4_BUILD=true ) - fi - - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=( -DQCA_SUFFIX=QT5 ) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile - - if use doc; then - pushd ${BUILD_DIR} /dev/null - doxygen . || die - popd /dev/null - fi -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test + local mycmakeargs=( + -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins + -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features + $(cmake-utils_use qt4 QT4_BUILD) + $(qca_plugin_use botan) + $(qca_plugin_use gcrypt) + $(qca_plugin_use gpg gnupg) + $(qca_plugin_use logger) + $(qca_plugin_use nss) + $(qca_plugin_use openssl ossl) + $(qca_plugin_use pkcs11) + $(qca_plugin_use sasl cyrus-sasl) + $(qca_plugin_use softstore) + $(cmake-utils_use_build test TESTS) + ) + cmake-utils_src_configure } src_install() { - multibuild_foreach_variant cmake-utils_src_install + cmake-utils_src_install if use doc; then - pushd ${BUILD_DIR} /dev/null - dodoc -r html - popd /dev/null + pushd ${BUILD_DIR} /dev/null + doxygen Doxyfile || die + dohtml apidocs/html/* + popd /dev/null fi if use examples; then
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: feaee98076362e48df568e9d8c1b063f35b9cbb0 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Sat Nov 29 14:15:43 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Sat Nov 29 14:15:43 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=feaee980 [app-crypt/qca] Fix doxygen. Package-Manager: portage-2.2.14 --- app-crypt/qca/qca-.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index ced22b0..9095c40 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -101,7 +101,7 @@ src_compile() { if use doc; then pushd ${BUILD_DIR} /dev/null - doxygen Doxyfile || die + doxygen . || die popd /dev/null fi } @@ -115,8 +115,8 @@ src_install() { if use doc; then pushd ${BUILD_DIR} /dev/null - dohtml apidocs/html/* - popd /dev/null + dodoc -r html + popd /dev/null fi if use examples; then
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: b2943637581feb634f26af082432278c305d588b Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Sat Nov 29 14:06:34 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Sat Nov 29 14:06:34 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b2943637 [app-crypt/qca] Ensure at least one variant is built. Package-Manager: portage-2.2.14 --- app-crypt/qca/qca-.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index f1c1452..ced22b0 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -16,6 +16,8 @@ KEYWORDS= IUSE=botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test +REQUIRED_USE=|| ( qt4 qt5 ) + RDEPEND= !app-crypt/qca-cyrus-sasl !app-crypt/qca-gnupg
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 9146141c89bf4249e78e602b1c18e858adca2143 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Fri Nov 28 18:51:43 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Fri Nov 28 18:53:02 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9146141c [app-crypt/qca] Add experimental multibuild support. This is subject to change as upstream is still in flux. Package-Manager: portage-2.2.14 --- app-crypt/qca/qca-.ebuild | 76 +++ 1 file changed, 55 insertions(+), 21 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 8e313ba..f1c1452 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit multilib cmake-utils git-r3 +inherit cmake-utils multilib multibuild git-r3 DESCRIPTION=Qt Cryptographic Architecture (QCA) HOMEPAGE=http://delta.affinix.com/qca/; @@ -15,7 +15,6 @@ SLOT=2 KEYWORDS= IUSE=botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test -REQUIRED_USE=^^ ( qt4 qt5 ) RDEPEND= !app-crypt/qca-cyrus-sasl @@ -54,31 +53,66 @@ qca_plugin_use() { echo -DWITH_${2:-$1}_PLUGIN=$(use $1 echo yes || echo no) } +pkg_setup() { + MULTIBUILD_VARIANTS=() + if use qt4; then + MULTIBUILD_VARIANTS+=( qt4 ) + fi + if use qt5; then + MULTIBUILD_VARIANTS+=( qt5 ) + fi +} + src_configure() { - local mycmakeargs=( - -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins - -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features - $(cmake-utils_use qt4 QT4_BUILD) - $(qca_plugin_use botan) - $(qca_plugin_use gcrypt) - $(qca_plugin_use gpg gnupg) - $(qca_plugin_use logger) - $(qca_plugin_use nss) - $(qca_plugin_use openssl ossl) - $(qca_plugin_use pkcs11) - $(qca_plugin_use sasl cyrus-sasl) - $(qca_plugin_use softstore) - $(cmake-utils_use_build test TESTS) - ) - cmake-utils_src_configure + myconfigure() { + local mycmakeargs=( + -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins + -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features + $(qca_plugin_use botan) + $(qca_plugin_use gcrypt) + $(qca_plugin_use gpg gnupg) + $(qca_plugin_use logger) + $(qca_plugin_use nss) + $(qca_plugin_use openssl ossl) + $(qca_plugin_use pkcs11) + $(qca_plugin_use sasl cyrus-sasl) + $(qca_plugin_use softstore) + $(cmake-utils_use_build test TESTS) + ) + + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then + mycmakeargs+=( -DQT4_BUILD=true ) + fi + + if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then + mycmakeargs+=( -DQCA_SUFFIX=QT5 ) + fi + + cmake-utils_src_configure + } + + multibuild_foreach_variant myconfigure } -src_install() { - cmake-utils_src_install +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile if use doc; then - pushd ${BUILD_DIR} /dev/null + pushd ${BUILD_DIR} /dev/null doxygen Doxyfile || die + popd /dev/null + fi +} + +src_test() { + multibuild_foreach_variant cmake-utils_src_test +} + +src_install() { + multibuild_foreach_variant cmake-utils_src_install + + if use doc; then + pushd ${BUILD_DIR} /dev/null dohtml apidocs/html/* popd /dev/null fi
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 508018b49bc265b37a0634731b3528e828db329c Author: Uwe L. Korn uwelk AT xhochy DOT com AuthorDate: Wed Sep 24 11:43:55 2014 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Wed Sep 24 11:43:55 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=508018b4 [app-crypt/qca] Correct plugin path to upstream changes Package-Manager: portage-2.2.12 --- app-crypt/qca/qca-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index d3bed01..8e313ba 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -56,7 +56,7 @@ qca_plugin_use() { src_configure() { local mycmakeargs=( - -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins/crypto + -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features $(cmake-utils_use qt4 QT4_BUILD) $(qca_plugin_use botan)
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 50edfb7a66d7f27d07dab8fe770930aa979f612e Author: Elias Probst mail AT eliasprobst DOT eu AuthorDate: Wed Aug 20 21:51:31 2014 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Wed Aug 20 21:51:31 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=50edfb7a [app-crypt/qca] Install the QCA plugins into the Qt plugin directory. --- app-crypt/qca/qca-.ebuild | 5 + 1 file changed, 5 insertions(+) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index a2d91a1..f290f43 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -68,6 +68,11 @@ src_configure() { $(with_plugin_use pkcs11) $(with_plugin_use softstore) ) + if use qt4; then + mycmakeargs+=(-DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt4/plugins/crypto) + else + mycmakeargs+=(-DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt5/plugins/crypto) + fi cmake-utils_src_configure }
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: a00efb254eca85bbfca006d9f901e55d1e90cdfa Author: Davide Pesavento pesa AT gentoo DOT org AuthorDate: Thu Aug 21 01:00:13 2014 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Thu Aug 21 01:00:13 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a00efb25 [app-crypt/qca] Specify correct QCA_FEATURE_INSTALL_DIR. Package-Manager: portage-2.2.12 --- app-crypt/qca/qca-.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 395eb61..d3bed01 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -13,7 +13,9 @@ EGIT_REPO_URI=git://anongit.kde.org/${PN}.git LICENSE=LGPL-2.1 SLOT=2 KEYWORDS= + IUSE=botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test +REQUIRED_USE=^^ ( qt4 qt5 ) RDEPEND= !app-crypt/qca-cyrus-sasl @@ -45,7 +47,6 @@ DEPEND=${RDEPEND} qt5? ( dev-qt/qttest:5 ) ) -REQUIRED_USE=^^ ( qt4 qt5 ) DOCS=( README TODO ) @@ -55,7 +56,8 @@ qca_plugin_use() { src_configure() { local mycmakeargs=( - -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usev qt4 || usev qt5)/plugins/crypto + -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins/crypto + -DQCA_FEATURE_INSTALL_DIR=${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features $(cmake-utils_use qt4 QT4_BUILD) $(qca_plugin_use botan) $(qca_plugin_use gcrypt)
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: c91b9572689a22e2b804b62244ea9946881809b4 Author: Davide Pesavento pesa AT gentoo DOT org AuthorDate: Thu Aug 21 00:33:52 2014 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Thu Aug 21 00:33:52 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c91b9572 [app-crypt/qca] Minor cleanup. Package-Manager: portage-2.2.12 --- app-crypt/qca/metadata.xml| 26 +++--- app-crypt/qca/qca-.ebuild | 50 +++ 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml index 379ecd4..71e6485 100644 --- a/app-crypt/qca/metadata.xml +++ b/app-crypt/qca/metadata.xml @@ -1,16 +1,18 @@ ?xml version=1.0 encoding=UTF-8? !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd; pkgmetadata - herd/herd - use - flag name='botan'Enable botan plugin/flag - flag name='sasl'Enable cyrus-sasl plugin/flag - flag name='gcrypt'Enable gcrypt plugin/flag - flag name='gpg'Enable GnuPG plugin/flag - flag name='logger'Enable logger plugin/flag - flag name='nss'Enable NSS plugin/flag - flag name='openssl'Enable OpenSSL plugin/flag - flag name='pkcs11'Enable PKCS#11 plugin/flag - flag name='softstore'Enable softstore plugin/flag - /use +herdcrypto/herd +herdqt/herd +herdkde/herd +use + flag name=botanEnable botan plugin/flag + flag name=gcryptEnable gcrypt plugin/flag + flag name=gpgEnable GnuPG plugin/flag + flag name=loggerEnable logger plugin/flag + flag name=nssEnable NSS plugin/flag + flag name=opensslEnable OpenSSL plugin/flag + flag name=pkcs11Enable PKCS#11 plugin/flag + flag name=saslEnable SASL plugin/flag + flag name=softstoreEnable softstore plugin/flag +/use /pkgmetadata diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index f290f43..395eb61 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-utils git-r3 +inherit multilib cmake-utils git-r3 DESCRIPTION=Qt Cryptographic Architecture (QCA) HOMEPAGE=http://delta.affinix.com/qca/; @@ -22,58 +22,52 @@ RDEPEND= !app-crypt/qca-ossl !app-crypt/qca-pkcs11 botan? ( dev-libs/botan ) - sasl? ( dev-libs/cyrus-sasl ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) openssl? ( dev-libs/openssl:0 ) pkcs11? ( dev-libs/openssl:0 - =dev-libs/pkcs11-helper-1.02 + dev-libs/pkcs11-helper ) qt4? ( dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 - ) + ) + sasl? ( dev-libs/cyrus-sasl:2 ) + DEPEND=${RDEPEND} doc? ( app-doc/doxygen ) test? ( qt4? ( dev-qt/qttest:4 ) qt5? ( dev-qt/qttest:5 ) ) - !app-crypt/qca-1.0-r3:0 - + REQUIRED_USE=^^ ( qt4 qt5 ) DOCS=( README TODO ) -with_plugin_use() { - [[ -z $1 ]] die with_plugin_use USE flag [flag name] +qca_plugin_use() { echo -DWITH_${2:-$1}_PLUGIN=$(use $1 echo yes || echo no) } src_configure() { local mycmakeargs=( + -DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/$(usev qt4 || usev qt5)/plugins/crypto $(cmake-utils_use qt4 QT4_BUILD) - $(cmake-utils_use test BUILD_TESTS) - $(with_plugin_use botan) - $(with_plugin_use sasl cyrus-sasl) - $(with_plugin_use gcrypt) - $(with_plugin_use gpg gnupg) - $(with_plugin_use logger) - $(with_plugin_use nss) - $(with_plugin_use openssl ossl) - $(with_plugin_use pkcs11) - $(with_plugin_use softstore) + $(qca_plugin_use botan) + $(qca_plugin_use gcrypt) + $(qca_plugin_use gpg gnupg) + $(qca_plugin_use logger) + $(qca_plugin_use nss) + $(qca_plugin_use openssl ossl) + $(qca_plugin_use pkcs11) + $(qca_plugin_use sasl cyrus-sasl) + $(qca_plugin_use softstore) + $(cmake-utils_use_build test TESTS) ) - if use qt4; then - mycmakeargs+=(-DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt4/plugins/crypto) - else - mycmakeargs+=(-DQCA_PLUGINS_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)/qt5/plugins/crypto) - fi - cmake-utils_src_configure } @@ -81,14 +75,14 @@ src_install() { cmake-utils_src_install if use doc; then - pushd ${BUILD_DIR} - doxygen Doxyfile
[gentoo-commits] proj/qt:master commit in: app-crypt/qca/
commit: 9f5faa637b777b10548638a053969cb93558d6fc Author: Uwe L. Korn uwelk AT xhochy DOT com AuthorDate: Sun Jun 29 22:52:35 2014 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Sun Jun 29 22:53:01 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9f5faa63 [app-crypt/qca] includes plugins, so block on old packages. Package-Manager: portage-2.2.10 --- app-crypt/qca/qca-.ebuild | 5 + 1 file changed, 5 insertions(+) diff --git a/app-crypt/qca/qca-.ebuild b/app-crypt/qca/qca-.ebuild index 60a8531..a2d91a1 100644 --- a/app-crypt/qca/qca-.ebuild +++ b/app-crypt/qca/qca-.ebuild @@ -16,6 +16,11 @@ KEYWORDS= IUSE=botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test RDEPEND= + !app-crypt/qca-cyrus-sasl + !app-crypt/qca-gnupg + !app-crypt/qca-logger + !app-crypt/qca-ossl + !app-crypt/qca-pkcs11 botan? ( dev-libs/botan ) sasl? ( dev-libs/cyrus-sasl ) gcrypt? ( dev-libs/libgcrypt:= )