From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1143640-garchives=archives.gentoo.org@lists.gentoo.org>
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 64C53138350
	for <garchives@archives.gentoo.org>; Fri,  7 Feb 2020 08:55:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 98282E0885;
	Fri,  7 Feb 2020 08:55:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 77D81E0885
	for <gentoo-commits@lists.gentoo.org>; Fri,  7 Feb 2020 08:55:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 3F7E934DA9A
	for <gentoo-commits@lists.gentoo.org>; Fri,  7 Feb 2020 08:55:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E245B10C
	for <gentoo-commits@lists.gentoo.org>; Fri,  7 Feb 2020 08:55:19 +0000 (UTC)
From: "Stefan Strogin" <steils@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" <steils@gentoo.org>
Message-ID: <1581065609.ca50ec49c022566889fc7d4aed77e60a4f68da77.steils@gentoo>
Subject: [gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
X-VCS-Repository: repo/proj/libressl
X-VCS-Files: app-crypt/qca/qca-2.2.1.ebuild
X-VCS-Directories: app-crypt/qca/
X-VCS-Committer: steils
X-VCS-Committer-Name: Stefan Strogin
X-VCS-Revision: ca50ec49c022566889fc7d4aed77e60a4f68da77
X-VCS-Branch: master
Date: Fri,  7 Feb 2020 08:55:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ea1fb623-429a-4623-9238-325360b857fd
X-Archives-Hash: 408a531cb18c7c069868ee02b4dee6b3

commit:     ca50ec49c022566889fc7d4aed77e60a4f68da77
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 08:53:29 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Fri Feb  7 08:53:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ca50ec49

app-crypt/qca: sync; 2.2.1 stable for amd64, arm64, x86

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 app-crypt/qca/qca-2.2.1.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index dcb155a..48cd52e 100644
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="https://userbase.kde.org/QCA"
@@ -11,9 +11,10 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? ( app-doc/doxygen )
@@ -66,16 +67,16 @@ src_configure() {
 		$(qca_plugin_use ssl ossl)
 		-DBUILD_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc; then
 		pushd "${BUILD_DIR}" >/dev/null || die