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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6028715800D for ; Sat, 1 Jul 2023 14:36:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B068E086F; Sat, 1 Jul 2023 14:36:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 714E8E086F for ; Sat, 1 Jul 2023 14:36:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D8B1335D9A for ; Sat, 1 Jul 2023 14:36:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02800136 for ; Sat, 1 Jul 2023 14:36:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1688222060.3fd08a36194c8b81f46d51876211f7f3cc0ae3ce.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-9999.ebuild X-VCS-Directories: net-misc/curl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3fd08a36194c8b81f46d51876211f7f3cc0ae3ce X-VCS-Branch: master Date: Sat, 1 Jul 2023 14:36:24 +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: 7b72ec45-78e0-49c2-a3cb-a17514bbd0ae X-Archives-Hash: 511fc308af32530f462e134eb57540d6 commit: 3fd08a36194c8b81f46d51876211f7f3cc0ae3ce Author: Sam James gentoo org> AuthorDate: Sat Jul 1 14:31:07 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 1 14:34:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd08a36 net-misc/curl: install zsh, fish completions Noticed after Alpine fixed theirs (thanks!) Signed-off-by: Sam James gentoo.org> net-misc/curl/curl-9999.ebuild | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild index 770410045476..a0aa3e608fd7 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc -inherit autotools multilib-minimal multiprocessing prefix verify-sig +inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig DESCRIPTION="A Client that groks URLs" HOMEPAGE="https://curl.se/" @@ -137,7 +137,7 @@ multilib_src_configure() { local myconf=() myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then + if use ssl; then myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) if use gnutls; then @@ -241,7 +241,7 @@ multilib_src_configure() { --without-amissl --without-bearssl $(use_with brotli) - --without-fish-functions-dir + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d $(use_with http2 nghttp2) --without-hyper $(use_with idn libidn2) @@ -263,6 +263,7 @@ multilib_src_configure() { --without-wolfssl --with-zlib $(use_with zstd) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions ) if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then @@ -305,6 +306,15 @@ multilib_src_configure() { echo "Requires.private: ${priv[*]}" >> libcurl.pc || die } +multilib_src_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + # There is also a pytest harness that tests for bugs in some very specific # situations; we can rely on upstream for this rather than adding additional test deps. multilib_src_test() { @@ -324,6 +334,15 @@ multilib_src_test() { multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((7*$(makeopts_jobs))) !241 !1083" } +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + multilib_src_install_all() { einstalldocs find "${ED}" -type f -name '*.la' -delete || die