From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1303014-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 95E45139347
for <garchives@archives.gentoo.org>; Fri, 16 Jul 2021 06:01:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 79DD0E0A64;
Fri, 16 Jul 2021 06:01:27 +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 5E1FBE0A64
for <gentoo-commits@lists.gentoo.org>; Fri, 16 Jul 2021 06:01:27 +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 19AD7342AB2
for <gentoo-commits@lists.gentoo.org>; Fri, 16 Jul 2021 06:01:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 97A107D9
for <gentoo-commits@lists.gentoo.org>; Fri, 16 Jul 2021 06:01:23 +0000 (UTC)
From: "Joonas Niilola" <juippis@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, "Joonas Niilola" <juippis@gentoo.org>
Message-ID: <1626415248.e1ce8e9db947f837e833ccea1a63b4c5f84f662a.juippis@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/wimlib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-arch/wimlib/wimlib-1.13.4.ebuild
X-VCS-Directories: app-arch/wimlib/
X-VCS-Committer: juippis
X-VCS-Committer-Name: Joonas Niilola
X-VCS-Revision: e1ce8e9db947f837e833ccea1a63b4c5f84f662a
X-VCS-Branch: master
Date: Fri, 16 Jul 2021 06:01:23 +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: 68a5cab6-f63b-4839-a330-841c7f341955
X-Archives-Hash: f54d6a40bc0d9eefe415a9ff89d2ff8a
commit: e1ce8e9db947f837e833ccea1a63b4c5f84f662a
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 06:00:48 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 06:00:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ce8e9d
app-arch/wimlib: openssl -> ssl in 1.13.4
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-arch/wimlib/wimlib-1.13.4.ebuild | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/app-arch/wimlib/wimlib-1.13.4.ebuild b/app-arch/wimlib/wimlib-1.13.4.ebuild
index 20589458d68..84e997127f0 100644
--- a/app-arch/wimlib/wimlib-1.13.4.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.4.ebuild
@@ -12,8 +12,7 @@ SRC_URI="https://wimlib.net/downloads/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm"
-REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs ssl test threads yasm"
RESTRICT="!test? ( test )"
@@ -32,7 +31,7 @@ RDEPEND="
app-cdr/cdrtools
)
ntfs? ( sys-fs/ntfs3g )
- openssl? ( dev-libs/openssl:0= )
+ ssl? ( dev-libs/openssl:0= )
"
src_prepare() {
@@ -44,12 +43,22 @@ src_configure() {
local myeconfargs=(
$(use_with ntfs ntfs-3g)
$(use_with fuse)
- $(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
- $(use_with openssl libcrypto)
+ $(use_with ssl libcrypto)
$(use_enable threads multithreaded-compression)
$(use_enable test test-support)
--disable-static
)
+
+ if use cpu_flags_x86_ssse3; then
+ if ! use ssl; then
+ myeconfargs+=( --enable-ssse3-sha1 )
+ else
+ elog "cpu_flags_x86_ssse3 and ssl can't be enabled together, "
+ elog "enabling ssl and disabling cpu_flags_x86_ssse3 for you."
+ myeconfargs+=( --disable-ssse3-sha1 )
+ fi
+ fi
+
ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
econf "${myeconfargs[@]}"
}