diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-crypt/qca | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-crypt/qca')
-rw-r--r-- | app-crypt/qca/Manifest | 2 | ||||
-rw-r--r-- | app-crypt/qca/files/qca-2.0.2-pcfilespath.patch | 13 | ||||
-rw-r--r-- | app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch | 59 | ||||
-rw-r--r-- | app-crypt/qca/files/qca-2.1.0.3-qt55.patch | 26 | ||||
-rw-r--r-- | app-crypt/qca/files/qca-disable-pgp-test.patch | 13 | ||||
-rw-r--r-- | app-crypt/qca/metadata.xml | 18 | ||||
-rw-r--r-- | app-crypt/qca/qca-2.0.3-r1.ebuild | 80 | ||||
-rw-r--r-- | app-crypt/qca/qca-2.1.0.3.ebuild | 123 |
8 files changed, 334 insertions, 0 deletions
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest new file mode 100644 index 000000000000..627c06d184ca --- /dev/null +++ b/app-crypt/qca/Manifest @@ -0,0 +1,2 @@ +DIST qca-2.0.3.tar.bz2 4530731 SHA256 8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f SHA512 c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb WHIRLPOOL 2efba46098490ab5a75dcdf95eeb7d81a5509a962403a44602caa126927ebe9e69cb043586dbaebf0b111b79e614b607ae851242d12af9fa17d2dd191e559b0e +DIST qca-qt5-2.1.0.3.tar.xz 685652 SHA256 ab0170696a8ff87588d38a72d36d0b4b42db9080c991d1a40ceb3f8311d289f9 SHA512 2f50c92d3ff927c83353b65ae56ff49a5c1ea439fcef94cea0092b718f04abcc18f455abd91337ac786fddedae980ff55c9d090b5743a96890174dc7eee4f3f1 WHIRLPOOL 9db2770b031dbf5c9c117d4150e0b395c94d8a0af1bda9fac5e1ee862a8a40f1c03fb0c4901e3aaba0b12e8c0b4e71cb55a872bbc54eea8331aff3fbe1fd853c diff --git a/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch b/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch new file mode 100644 index 000000000000..c52e8e78071b --- /dev/null +++ b/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch @@ -0,0 +1,13 @@ +Index: qca-2.0.2/configure +=================================================================== +--- qca-2.0.2.orig/configure ++++ qca-2.0.2/configure +@@ -937,7 +937,7 @@ public: + if(!pcfiles.isEmpty()) + { + str = QString( +- "pcfiles.path = \$\$LIBDIR/pkgconfig\n" ++ "pcfiles.path = \$\$LIBDIR/../pkgconfig\n" + "pcfiles.files = %1\n" + "INSTALLS += pcfiles\n" + ).arg(pcfiles.join(" ")); diff --git a/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch b/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch new file mode 100644 index 000000000000..1752dff910ff --- /dev/null +++ b/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch @@ -0,0 +1,59 @@ +--- trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h 2012/01/14 16:09:19 1273507 ++++ trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h 2012/01/14 17:12:15 1273508 +@@ -191,15 +191,15 @@ + { + public: + MemoryVector<T>& operator=(const MemoryRegion<T>& in) +- { if(this != &in) set(in); return (*this); } ++ { if(this != &in) this->set(in); return (*this); } + + MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); } + MemoryVector(const T in[], u32bit n) +- { MemoryRegion<T>::init(false); set(in, n); } ++ { MemoryRegion<T>::init(false); this->set(in, n); } + MemoryVector(const MemoryRegion<T>& in) +- { MemoryRegion<T>::init(false); set(in); } ++ { MemoryRegion<T>::init(false); this->set(in); } + MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2) +- { MemoryRegion<T>::init(false); set(in1); append(in2); } ++ { MemoryRegion<T>::init(false); this->set(in1); append(in2); } + }; + + /************************************************* +@@ -210,15 +210,15 @@ + { + public: + SecureVector<T>& operator=(const MemoryRegion<T>& in) +- { if(this != &in) set(in); return (*this); } ++ { if(this != &in) this->set(in); return (*this); } + + SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); } + SecureVector(const T in[], u32bit n) +- { MemoryRegion<T>::init(true); set(in, n); } ++ { MemoryRegion<T>::init(true); this->set(in, n); } + SecureVector(const MemoryRegion<T>& in) +- { MemoryRegion<T>::init(true); set(in); } ++ { MemoryRegion<T>::init(true); this->set(in); } + SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2) +- { MemoryRegion<T>::init(true); set(in1); append(in2); } ++ { MemoryRegion<T>::init(true); this->set(in1); append(in2); } + }; + + /************************************************* +@@ -229,14 +229,14 @@ + { + public: + SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in) +- { if(this != &in) set(in); return (*this); } ++ { if(this != &in) this->set(in); return (*this); } + + SecureBuffer() { MemoryRegion<T>::init(true, L); } + SecureBuffer(const T in[], u32bit n) + { MemoryRegion<T>::init(true, L); copy(in, n); } + private: + SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in) +- { if(this != &in) set(in); return (*this); } ++ { if(this != &in) this->set(in); return (*this); } + }; + + } diff --git a/app-crypt/qca/files/qca-2.1.0.3-qt55.patch b/app-crypt/qca/files/qca-2.1.0.3-qt55.patch new file mode 100644 index 000000000000..277c24e02800 --- /dev/null +++ b/app-crypt/qca/files/qca-2.1.0.3-qt55.patch @@ -0,0 +1,26 @@ +From 7207e6285e932044cd66d49d0dc484666cfb0092 Mon Sep 17 00:00:00 2001 +From: Hrvoje Senjan <hrvoje.senjan@gmail.com> +Date: Sat, 17 Jan 2015 20:12:18 +0100 +Subject: [PATCH] Add missing QIODevice include + +Fixes build with Qt 5.5 +--- + include/QtCrypto/qca_basic.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/QtCrypto/qca_basic.h b/include/QtCrypto/qca_basic.h +index 42808c5..e0c6cbb 100644 +--- a/include/QtCrypto/qca_basic.h ++++ b/include/QtCrypto/qca_basic.h +@@ -35,6 +35,8 @@ + + #include "qca_core.h" + ++#include <QIODevice> ++ + // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does + // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII. + // Defining it here as QString::fromUtf8 for convenience. +-- +2.0.5 + 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..71e64852ee63 --- /dev/null +++ b/app-crypt/qca/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>crypto</herd> +<herd>qt</herd> +<herd>kde</herd> +<use> + <flag name="botan">Enable botan 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="sasl">Enable SASL plugin</flag> + <flag name="softstore">Enable softstore plugin</flag> +</use> +</pkgmetadata> diff --git a/app-crypt/qca/qca-2.0.3-r1.ebuild b/app-crypt/qca/qca-2.0.3-r1.ebuild new file mode 100644 index 000000000000..13d9729ad713 --- /dev/null +++ b/app-crypt/qca/qca-2.0.3-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="3" + +inherit eutils multilib qt4-r2 + +DESCRIPTION="Qt Cryptographic Architecture (QCA)" +HOMEPAGE="http://delta.affinix.com/qca/" +SRC_URI="http://delta.affinix.com/download/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +IUSE="aqua debug doc examples gpg logger +openssl pkcs11 sasl" +RESTRICT="test" + +DEPEND="dev-qt/qtcore:4[debug?]" +RDEPEND="${DEPEND} + !<app-crypt/qca-1.0-r3:0" + +PDEPEND="gpg? ( app-crypt/qca-gnupg ) + logger? ( app-crypt/qca-logger ) + openssl? ( app-crypt/qca-ossl ) + pkcs11? ( app-crypt/qca-pkcs11 ) + sasl? ( app-crypt/qca-cyrus-sasl )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.0.2-pcfilespath.patch \ + "${FILESDIR}"/${P}+gcc-4.7.patch + + if use aqua; then + sed -i -e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \ + src/src.pro || die + fi +} + +src_configure() { + # Ensure proper rpath + export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/$(get_libdir)/qca2" + + ABI= ./configure \ + --prefix="${EPREFIX}"/usr \ + --qtdir="${EPREFIX}"/usr \ + --includedir="${EPREFIX}"/usr/include/qca2 \ + --libdir="${EPREFIX}"/usr/$(get_libdir)/qca2 \ + --certstore-path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \ + --no-separate-debug-info \ + --disable-tests \ + --$(use debug && echo debug || echo release) \ + --no-framework \ + || die "configure failed" + + eqmake4 +} + +src_install() { + emake INSTALL_ROOT="${D}" install || die + dodoc README TODO || die + + cat <<-EOF > "${WORKDIR}"/44qca2 + LDPATH="${EPREFIX}/usr/$(get_libdir)/qca2" + EOF + doenvd "${WORKDIR}"/44qca2 || die + + if use doc; then + dohtml "${S}"/apidocs/html/* || die + fi + + if use examples; then + insinto /usr/share/doc/${PF}/ + doins -r "${S}"/examples || die + fi + + # add the proper rpath for packages that do CONFIG += crypto + echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/$(get_libdir)/qca2\"" >> \ + "${D%/}${EPREFIX}/usr/share/qt4/mkspecs/features/crypto.prf" \ + || die "failed to add rpath to crypto.prf" +} diff --git a/app-crypt/qca/qca-2.1.0.3.ebuild b/app-crypt/qca/qca-2.1.0.3.ebuild new file mode 100644 index 000000000000..6bf313296207 --- /dev/null +++ b/app-crypt/qca/qca-2.1.0.3.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils multibuild qmake-utils + +MY_PN="${PN}-qt5" + +DESCRIPTION="Qt Cryptographic Architecture (QCA)" +HOMEPAGE="http://delta.affinix.com/qca/" +SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.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 logger nss +openssl pkcs11 +qt4 qt5 sasl softstore 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 ) + gcrypt? ( dev-libs/libgcrypt:= ) + gpg? ( app-crypt/gnupg ) + nss? ( dev-libs/nss ) + openssl? ( >=dev-libs/openssl-1.0.1:0 ) + pkcs11? ( + dev-libs/openssl:0 + 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 ) + ) +" + +S=${WORKDIR}/${MY_PN}-${PV} + +DOCS=( README TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-disable-pgp-test.patch" + "${FILESDIR}/${P}-qt55.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 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) + 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 +} |