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[@]}" }
