From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-crypt/qca/Manifest | 7 ++ app-crypt/qca/files/qca-2.1.3-c++11.patch | 97 ++++++++++++++++++++ app-crypt/qca/files/qca-disable-pgp-test.patch | 13 +++ app-crypt/qca/metadata.xml | 26 ++++++ app-crypt/qca/qca-2.1.3-r1.ebuild | 122 +++++++++++++++++++++++++ 5 files changed, 265 insertions(+) create mode 100644 app-crypt/qca/Manifest create mode 100644 app-crypt/qca/files/qca-2.1.3-c++11.patch create mode 100644 app-crypt/qca/files/qca-disable-pgp-test.patch create mode 100644 app-crypt/qca/metadata.xml create mode 100644 app-crypt/qca/qca-2.1.3-r1.ebuild (limited to 'app-crypt/qca') diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest new file mode 100644 index 000000000000..37222cfd8065 --- /dev/null +++ b/app-crypt/qca/Manifest @@ -0,0 +1,7 @@ +AUX qca-2.1.3-c++11.patch 3555 SHA256 7c0b358d3617a1c78f406efbd1eb21ab617d3a73af733acd33dcee8368f0e9d2 SHA512 605a602d184c86426d6d875954ad2cb3bee19252ce56e6581df7574a3e324f97ccfcb919fef32f6ff8a393683b8375d97586ed886ae01d87fbe015f2f83f0e3b WHIRLPOOL be6dd35df3fc651da7670a7d34b005f001df08d5c1516b8a41a95ab95b848112fb72e67b95ae6c47d6386303a428a94cbba210bc6a1ad8d99f2d8e8ba19c5011 +AUX qca-disable-pgp-test.patch 446 SHA256 e8714b0f12a39bbc17c706b098e4d33a5cbfb6a84b9c25d7dc8bf7ac7cfdff92 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104 WHIRLPOOL 5c31bbfe3f7e680be7314edc7c9d153d27fd2bbbaa0ddc97c9206a9c49e0d5b0738e78a4d8dc424c3910ce1b02e4657aa08643fc1a56836b33e9b475b85f3501 +DIST qca-2.1.3.tar.xz 686340 SHA256 003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a WHIRLPOOL bd004ad0e754850e4349aef72a7bc2449a95850b86bb383d9a60fb7d7c69c7e5e2dcc8e1cc945b647623678484f0bd15c5e125e7e278c2a0964b28b48ee8c8f3 +EBUILD qca-2.1.3-r1.ebuild 2718 SHA256 d708b621bc174ac68b032b15edd626f6919175a1d9f4520fbed7159e3fae6f91 SHA512 208aedcd1a70d93f203be5d587777d5ea3ca3931122a2e8e9010f741d942ab99522bb0e0c247977ae983384cc5d964e5fe7d173669e39cb865190661808dc54b WHIRLPOOL d7988dcddc4abf095a31926ebc36b1dbf7f5b015c04e16e962356bbccc4f00e29545ebc1a59adb30c9afdc12233633113db46d8cc83dbb5aa57f61ea9dd39131 +MISC ChangeLog 5471 SHA256 9e5237e4508353cab9326e2da9fd2ea117038edf569b1ff2fd6a4a65ace87ff0 SHA512 9a5f41e719633f600dd29396777f7f688477980515d36e9e6afbeb41cfa9248b771f180ad593bf0372e2a62e762b4072852252986417d40c0001c454ab847839 WHIRLPOOL a96eb863b2a52bdbabd609ef646af7f3961a37594c09ce3c4f585c585b6c3da60a9f39c04cd02937f7831e3e663211b0c6e4b52caf142d12533f6553158d7150 +MISC ChangeLog-2015 14599 SHA256 0e8754a20b2d9e43aad04fc4af6c19fa6675a59f9c010fb41097a96e9df022b0 SHA512 294f3bf5f9f281074bca75eed0f8007c743d50e189259726eaee465745826225a1a480db83be04a21432c7aa25e05f274833ba37ee75e0a14e506abacb4a6958 WHIRLPOOL 0ed91f436e405693395ed82b1b09bcd472813feebfe7859ccd2c06d8d5b15299d18913595b5922fa221c0c89cbd676708ae0d7a5554aa49add3ee274b246b56e +MISC metadata.xml 842 SHA256 29f18e8c6620f0bd47dc5e9039fd65c1d3022f428de7320fe786027370fd7d1c SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622 WHIRLPOOL 1491dfc24250dfac1f1d92bf89cd4e60774dd21731eee0e43dc6232a6562af36d897e6282cdd3b4abd68b3b595cf5458cdac7dc8bf809d12bfa0ec1a63a0edd5 diff --git a/app-crypt/qca/files/qca-2.1.3-c++11.patch b/app-crypt/qca/files/qca-2.1.3-c++11.patch new file mode 100644 index 000000000000..a12f96bfcf4a --- /dev/null +++ b/app-crypt/qca/files/qca-2.1.3-c++11.patch @@ -0,0 +1,97 @@ +From 5f18ebc705ec98e883aa63cb537e36e6a08b7e34 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +Date: Tue, 21 Mar 2017 12:23:17 +0200 +Subject: [PATCH] build: fix C++11 throwing distructors + +For >=C++11, explicitly mark throwing destructors `noexcept(false)` + +Thanks: Peter-Levine +--- + Doxyfile.in | 2 +- + src/botantools/botan/alloc_mmap/mmap_mem.cpp | 2 +- + src/botantools/botan/botan/allocate.h | 8 +++++++- + src/botantools/botan/botan/mem_pool.h | 2 +- + src/botantools/botan/mem_pool.cpp | 2 +- + 5 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/Doxyfile.in b/Doxyfile.in +index 59d9afe..844c234 100644 +--- a/Doxyfile.in ++++ b/Doxyfile.in +@@ -1070,7 +1070,7 @@ PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \ + # The macro definition that is found in the sources will be used. + # Use the PREDEFINED tag if you want to use a different macro definition. + +-EXPAND_AS_DEFINED = QCA_EXPORT ++EXPAND_AS_DEFINED = QCA_EXPORT QCA_NOEXCEPT + + # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then + # doxygen's preprocessor will remove all function-like macros that are alone +diff --git a/src/botantools/botan/alloc_mmap/mmap_mem.cpp b/src/botantools/botan/alloc_mmap/mmap_mem.cpp +index 362b688..54f0d23 100644 +--- a/src/botantools/botan/alloc_mmap/mmap_mem.cpp ++++ b/src/botantools/botan/alloc_mmap/mmap_mem.cpp +@@ -107,7 +107,7 @@ void* MemoryMapping_Allocator::alloc_block(u32bit n) + umask(old_umask); + } + +- ~TemporaryFile() ++ ~TemporaryFile() QCA_NOEXCEPT(false) + { + delete[] filepath; + if(fd != -1 && close(fd) == -1) +diff --git a/src/botantools/botan/botan/allocate.h b/src/botantools/botan/botan/allocate.h +index 0ac351e..52bc397 100644 +--- a/src/botantools/botan/botan/allocate.h ++++ b/src/botantools/botan/botan/allocate.h +@@ -40,6 +40,12 @@ namespace QCA { // WRAPNS_LINE + #include + namespace QCA { // WRAPNS_LINE + ++#if __cplusplus >= 201103L ++#define QCA_NOEXCEPT(x) noexcept(x) ++#else ++#define QCA_NOEXCEPT(x) ++#endif ++ + namespace Botan { + + /************************************************* +@@ -58,7 +64,7 @@ class Allocator + virtual void init() {} + virtual void destroy() {} + +- virtual ~Allocator() {} ++ virtual ~Allocator() QCA_NOEXCEPT(false) {} + }; + + /************************************************* +diff --git a/src/botantools/botan/botan/mem_pool.h b/src/botantools/botan/botan/mem_pool.h +index 32834b8..1cb903e 100644 +--- a/src/botantools/botan/botan/mem_pool.h ++++ b/src/botantools/botan/botan/mem_pool.h +@@ -63,7 +63,7 @@ class Pooling_Allocator : public Allocator + void destroy(); + + Pooling_Allocator(u32bit, bool); +- ~Pooling_Allocator(); ++ ~Pooling_Allocator() QCA_NOEXCEPT(false); + private: + void get_more_core(u32bit); + byte* allocate_blocks(u32bit); +diff --git a/src/botantools/botan/mem_pool.cpp b/src/botantools/botan/mem_pool.cpp +index 00280ec..baa47aa 100644 +--- a/src/botantools/botan/mem_pool.cpp ++++ b/src/botantools/botan/mem_pool.cpp +@@ -171,7 +171,7 @@ Pooling_Allocator::Pooling_Allocator(u32bit p_size, bool) : + /************************************************* + * Pooling_Allocator Destructor * + *************************************************/ +-Pooling_Allocator::~Pooling_Allocator() ++Pooling_Allocator::~Pooling_Allocator() QCA_NOEXCEPT(false) + { + delete mutex; + if(blocks.size()) +-- +2.10.2 + 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 000000000000..7944e3c358ea --- /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/metadata.xml b/app-crypt/qca/metadata.xml new file mode 100644 index 000000000000..dff1320aa6b8 --- /dev/null +++ b/app-crypt/qca/metadata.xml @@ -0,0 +1,26 @@ + + + + + crypto@gentoo.org + Crypto + + + qt@gentoo.org + Gentoo Qt Project + + + kde@gentoo.org + Gentoo KDE Project + + + 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-2.1.3-r1.ebuild b/app-crypt/qca/qca-2.1.3-r1.ebuild new file mode 100644 index 000000000000..1bdc07abea39 --- /dev/null +++ b/app-crypt/qca/qca-2.1.3-r1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils multibuild qmake-utils + +DESCRIPTION="Qt Cryptographic Architecture (QCA)" +HOMEPAGE="https://userbase.kde.org/QCA" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" + +IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test" +REQUIRED_USE="|| ( qt4 qt5 )" + +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:0 ) + gcrypt? ( dev-libs/libgcrypt:= ) + gpg? ( app-crypt/gnupg ) + nss? ( dev-libs/nss ) + pkcs11? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + dev-libs/pkcs11-helper + ) + qt4? ( >=dev-qt/qtcore-4.8.7-r2: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} + doc? ( app-doc/doxygen ) + test? ( + qt4? ( dev-qt/qttest:4 ) + qt5? ( dev-qt/qttest:5 ) + ) +" + +DOCS=( README TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-disable-pgp-test.patch" + "${FILESDIR}/${P}-c++11.patch" +) + +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 +} + +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 || die + doxygen Doxyfile.in || die + dodoc -r apidocs/html + popd >/dev/null || die + fi + + if use examples; then + dodoc -r "${S}"/examples + fi +} -- cgit v1.2.3