[gentoo-commits] proj/qt:master commit in: app-crypt/qca/files/, app-crypt/qca/, profiles/
commit: 8a74d3737e380d6ce551876b2360d1966297cd07
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 27 18:25:25 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 27 18:25:25 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8a74d373
app-crypt/qca: treeclean
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-crypt/qca/files/qca-disable-pgp-test.patch | 13 ---
app-crypt/qca/metadata.xml | 21 -
app-crypt/qca/qca-.ebuild | 114 -
profiles/categories| 1 -
4 files changed, 149 deletions(-)
diff --git a/app-crypt/qca/files/qca-disable-pgp-test.patch
b/app-crypt/qca/files/qca-disable-pgp-test.patch
deleted file mode 100644
index 7944e3c3..
--- a/app-crypt/qca/files/qca-disable-pgp-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/metadata.xml b/app-crypt/qca/metadata.xml
deleted file mode 100644
index 89f4f880..
--- a/app-crypt/qca/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- k...@gentoo.org
- Gentoo KDE Project
-
-
- https://bugs.kde.org/
-
-
- Enable botan plugin
- Enable gcrypt plugin
- Enable GnuPG plugin
- Enable logger plugin
- Enable NSS 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
deleted file mode 100644
index 1315314c..
--- a/app-crypt/qca/qca-.ebuild
+++ /dev/null
@@ -1,114 +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;
-
-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 )"
-
-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-text/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
[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
}
