From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1053697-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 2A691138334
for <garchives@archives.gentoo.org>; Mon, 22 Oct 2018 14:16:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 67C7CE0877;
Mon, 22 Oct 2018 14:16:46 +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 468F3E0877
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Oct 2018 14:16:46 +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 23869335CCC
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Oct 2018 14:16:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EB3B8436
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Oct 2018 14:16:42 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@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, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1540217742.774a00f0670ddee272754e864db2a4ee7acb3596.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
X-VCS-Directories: app-admin/gkrellm/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 774a00f0670ddee272754e864db2a4ee7acb3596
X-VCS-Branch: master
Date: Mon, 22 Oct 2018 14:16:42 +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-Archives-Salt: fadb0560-351a-4d21-b777-d30af766d330
X-Archives-Hash: 18e89f0396be9807a052b198b3fec706
commit: 774a00f0670ddee272754e864db2a4ee7acb3596
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 14:15:42 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 14:15:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774a00f0
app-admin/gkrellm: Fixed "gnutls" and "ssl" USE flag logic.
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
index 0dea33e32b5..4b9dfe89901 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,9 +20,9 @@ IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
dev-libs/glib:2
hddtemp? ( app-admin/hddtemp )
- gnutls? ( net-libs/gnutls )
- !gnutls? (
- ssl? (
+ ssl? (
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
@@ -75,15 +75,6 @@ src_prepare() {
src_compile() {
if use X ; then
- local sslopt=""
- if use gnutls; then
- sslopt="without-ssl=yes"
- elif use ssl; then
- sslopt="without-gnutls=yes"
- else
- sslopt="without-ssl=yes without-gnutls=yes"
- fi
-
emake \
${TARGET} \
CC="$(tc-getCC)" \
@@ -94,7 +85,7 @@ src_compile() {
$(usex nls "" "enable_nls=0") \
$(usex lm_sensors "" "without-libsensors=yes") \
$(usex ntlm "" "without-ntlm=yes") \
- ${sslopt}
+ $(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
else
cd server || die
emake \