commit: 2014b3fe8912bd8ac87346276973ca3513806897
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 8 14:05:22 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 16:29:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2014b3fe
app-crypt/qca: remove old
Package-Manager: portage-2.2.20.1
app-crypt/qca/Manifest | 1 -
app-crypt/qca/files/qca-2.0.2-pcfilespath.patch | 13 ---
app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch | 59 ----------
.../qca/files/qca-2.1.0.3-fix-signals-slots.patch | 28 -----
app-crypt/qca/qca-2.0.3-r1.ebuild | 80 -------------
app-crypt/qca/qca-2.1.0.3-r1.ebuild | 124 --------------------
app-crypt/qca/qca-2.1.0.3-r2.ebuild | 128 ---------------------
7 files changed, 433 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index e2549c9..151de0d 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,3 +1,2 @@
-DIST qca-2.0.3.tar.bz2 4530731 SHA256
8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f SHA512
c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb
WHIRLPOOL
2efba46098490ab5a75dcdf95eeb7d81a5509a962403a44602caa126927ebe9e69cb043586dbaebf0b111b79e614b607ae851242d12af9fa17d2dd191e559b0e
DIST qca-2.1.1.tar.xz 688460 SHA256
95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983 SHA512
f077b5a4cc6539e0880f4d0a615bebcf851f634e99c6c355522598204f625e5195e0cbc8a1976593669018e57eff95796c8fef69b1301b42cb18736bc8aa1abf
WHIRLPOOL
454751a76f5e59aa09d6cc979bc26a490b23a2e5308f663400f45f38a95e6ad7a34428cffb1a2a82ec6958aa0b4418e0054503a58b43e0c172201cbaa7c669f8
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
deleted file mode 100644
index c52e8e7..0000000
--- a/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 1752dff..0000000
--- a/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- 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-fix-signals-slots.patch
b/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch
deleted file mode 100644
index d03a178..0000000
--- a/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jan Grulich <[email protected]>
-Date: Thu, 17 Sep 2015 14:14:24 +0000
-Subject: Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from
include dir
-X-Git-Url:
http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=66b9754170759d9333d5fc1e348642814d0310dd
----
-Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from include dir
-REVIEW:125289
----
-
-
---- a/include/QtCrypto/qca_safetimer.h
-+++ b/include/QtCrypto/qca_safetimer.h
-@@ -44,12 +44,12 @@
- void setSingleShot(bool singleShot);
- int timerId() const;
-
--public slots:
-+public Q_SLOTS:
- void start(int msec);
- void start();
- void stop();
-
--signals:
-+Q_SIGNALS:
- void timeout();
-
- protected:
-
diff --git a/app-crypt/qca/qca-2.0.3-r1.ebuild
b/app-crypt/qca/qca-2.0.3-r1.ebuild
deleted file mode 100644
index 13d9729..0000000
--- a/app-crypt/qca/qca-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-r1.ebuild
b/app-crypt/qca/qca-2.1.0.3-r1.ebuild
deleted file mode 100644
index 0557851..0000000
--- a/app-crypt/qca/qca-2.1.0.3-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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"
- "${FILESDIR}/${P}-fix-signals-slots.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
-}
diff --git a/app-crypt/qca/qca-2.1.0.3-r2.ebuild
b/app-crypt/qca/qca-2.1.0.3-r2.ebuild
deleted file mode 100644
index df34a8e..0000000
--- a/app-crypt/qca/qca-2.1.0.3-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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 libressl 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? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0 )
- libressl? ( dev-libs/libressl )
- )
- pkcs11? (
- !libressl? ( dev-libs/openssl:0 )
- 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 )
-"
-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"
- "${FILESDIR}/${P}-fix-signals-slots.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
-}
