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 BCBCC138334 for ; Sun, 29 Sep 2019 02:56:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92507E095C; Sun, 29 Sep 2019 02:56:48 +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 792D8E095C for ; Sun, 29 Sep 2019 02:56:48 +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 6CB5634B6AD for ; Sun, 29 Sep 2019 02:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C4B5828 for ; Sun, 29 Sep 2019 02:56:44 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1569725774.9c26289544a6d7a224667b97709cdacff2abf5eb.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/neon/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/neon/neon-0.30.2.ebuild X-VCS-Directories: net-libs/neon/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9c26289544a6d7a224667b97709cdacff2abf5eb X-VCS-Branch: master Date: Sun, 29 Sep 2019 02:56:44 +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: b4105146-3b00-44ca-bd70-3c98fea72a62 X-Archives-Hash: f5ed8cf23d1ae8cdc6c5a0c3a5d2088a commit: 9c26289544a6d7a224667b97709cdacff2abf5eb Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Sep 28 02:43:02 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 29 02:56:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c262895 net-libs/neon: Use standard behavior of gnutls / ssl USE flags. Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> net-libs/neon/neon-0.30.2.ebuild | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild index eea871bc8d5..43d84694432 100644 --- a/net-libs/neon/neon-0.30.2.ebuild +++ b/net-libs/neon/neon-0.30.2.ebuild @@ -17,19 +17,20 @@ RESTRICT="test" RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) - !gnutls? ( ssl? ( - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) ) kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + net-libs/gnutls:0=[${MULTILIB_USEDEP}] + ) + !gnutls? ( + libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + ) + pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) + ) zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}]" @@ -75,10 +76,12 @@ multilib_src_configure() { myconf+=(--with-libxml2) fi - if use gnutls; then - myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") - elif use ssl; then - myconf+=(--with-ssl=openssl) + if use ssl; then + if use gnutls; then + myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") + else + myconf+=(--with-ssl=openssl) + fi fi econf \ @@ -105,7 +108,7 @@ multilib_src_install() { } multilib_src_install_all() { - find "${ED}" -name "*.la" -delete + find "${D}" -name "*.la" -type f -delete || die dodoc AUTHORS BUGS NEWS README THANKS TODO }