From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40A151382C5 for ; Wed, 7 Apr 2021 08:36:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95B26E09E1; Wed, 7 Apr 2021 08:36:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F960E09E1 for ; Wed, 7 Apr 2021 08:36:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55E16340CC7 for ; Wed, 7 Apr 2021 08:36:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE97863F for ; Wed, 7 Apr 2021 08:36:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1617784597.b1de4cef249cace6bc5f82c3145542ecbb55078a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/qca/Manifest app-crypt/qca/files/qca-2.3.1-gcc11.patch app-crypt/qca/qca-2.3.1.ebuild X-VCS-Directories: app-crypt/qca/files/ app-crypt/qca/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b1de4cef249cace6bc5f82c3145542ecbb55078a X-VCS-Branch: master Date: Wed, 7 Apr 2021 08:36:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 076b4af2-48ec-4adb-a405-5ebd6a1a2540 X-Archives-Hash: a7864f75c6993525f2171999c7b41cda commit: b1de4cef249cace6bc5f82c3145542ecbb55078a Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 7 08:33:29 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 7 08:36:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1de4cef app-crypt/qca: Drop 2.3.1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/Manifest | 1 - app-crypt/qca/files/qca-2.3.1-gcc11.patch | 30 ----------- app-crypt/qca/qca-2.3.1.ebuild | 87 ------------------------------- 3 files changed, 118 deletions(-) diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index a9118e9afad..880177b2651 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1,2 +1 @@ -DIST qca-2.3.1.tar.xz 725984 BLAKE2B a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052 SHA512 092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021 DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4 diff --git a/app-crypt/qca/files/qca-2.3.1-gcc11.patch b/app-crypt/qca/files/qca-2.3.1-gcc11.patch deleted file mode 100644 index cd4eaab8688..00000000000 --- a/app-crypt/qca/files/qca-2.3.1-gcc11.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f015cc64889035c084138864e2e030ece19c257b Mon Sep 17 00:00:00 2001 -From: Jeff Law -Date: Dec 04 2020 03:55:48 +0000 -Subject: Fix missing includes for gcc-11 - - -diff --git a/src/qca_cert.cpp b/src/qca_cert.cpp -index 5e73d98..225aecd 100644 ---- a/src/qca_cert.cpp -+++ b/src/qca_cert.cpp -@@ -19,6 +19,7 @@ - * - */ - -+#include - #include "qca_cert.h" - - #include "qca_publickey.h" -diff --git a/src/qca_default.cpp b/src/qca_default.cpp -index fd35702..db87e87 100644 ---- a/src/qca_default.cpp -+++ b/src/qca_default.cpp -@@ -19,6 +19,7 @@ - * - */ - -+#include - #include "qca_core.h" - - #include diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild deleted file mode 100644 index 4414a43132b..00000000000 --- a/app-crypt/qca/qca-2.3.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde.org cmake 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 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -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:= ) - gcrypt? ( dev-libs/libgcrypt:= ) - gpg? ( app-crypt/gnupg ) - nss? ( dev-libs/nss ) - pkcs11? ( - >=dev-libs/openssl-1.1 - dev-libs/pkcs11-helper - ) - sasl? ( dev-libs/cyrus-sasl:2 ) - ssl? ( >=dev-libs/openssl-1.1:0= ) -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-pgp-test.patch" - "${FILESDIR}/${P}-gcc11.patch" # bug 764047 -) - -qca_plugin_use() { - echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") -} - -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 -} - -src_test() { - local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake_src_test -} - -src_install() { - 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 -}