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 3F633158087 for ; Sun, 16 Jan 2022 09:34:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 686712BC001; Sun, 16 Jan 2022 09:34:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 B396B2BC001 for ; Sun, 16 Jan 2022 09:34:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 smtp.gentoo.org (Postfix) with ESMTPS id A4C6D343035 for ; Sun, 16 Jan 2022 09:34:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A51729A for ; Sun, 16 Jan 2022 09:34:10 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1642325617.538e155ff09754d737e20142b6519fb7b25c22d4.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/git-2.32.0-r1.ebuild dev-vcs/git/git-2.33.1.ebuild dev-vcs/git/git-2.34.1-r1.ebuild dev-vcs/git/git-2.34.1.ebuild dev-vcs/git/git-2.35.0_rc1.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild dev-vcs/git/git-9999.ebuild X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 538e155ff09754d737e20142b6519fb7b25c22d4 X-VCS-Branch: master Date: Sun, 16 Jan 2022 09:34:10 +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: 27e679f9-37c6-4fa0-97a8-bf65f6de7eab X-Archives-Hash: b331dd6826569d5da94313780aacb949 commit: 538e155ff09754d737e20142b6519fb7b25c22d4 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jan 16 09:33:37 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Jan 16 09:33:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538e155f dev-vcs/git: fix osxkeychain conditional, thanks Arfrever Closes: https://bugs.gentoo.org/831276 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Fabian Groffen gentoo.org> dev-vcs/git/git-2.32.0-r1.ebuild | 4 ++-- dev-vcs/git/git-2.33.1.ebuild | 4 ++-- dev-vcs/git/git-2.34.1-r1.ebuild | 4 ++-- dev-vcs/git/git-2.34.1.ebuild | 4 ++-- dev-vcs/git/git-2.35.0_rc1.ebuild | 4 ++-- dev-vcs/git/git-9999-r1.ebuild | 4 ++-- dev-vcs/git/git-9999-r2.ebuild | 4 ++-- dev-vcs/git/git-9999-r3.ebuild | 4 ++-- dev-vcs/git/git-9999.ebuild | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-vcs/git/git-2.32.0-r1.ebuild b/dev-vcs/git/git-2.32.0-r1.ebuild index 6c3d422fd38b..c2d24bdf91ed 100644 --- a/dev-vcs/git/git-2.32.0-r1.ebuild +++ b/dev-vcs/git/git-2.32.0-r1.ebuild @@ -315,7 +315,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -362,7 +362,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild index 26673133f9f9..ab8a8a02552e 100644 --- a/dev-vcs/git/git-2.33.1.ebuild +++ b/dev-vcs/git/git-2.33.1.ebuild @@ -311,7 +311,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -358,7 +358,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-2.34.1-r1.ebuild b/dev-vcs/git/git-2.34.1-r1.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-2.34.1-r1.ebuild +++ b/dev-vcs/git/git-2.34.1-r1.ebuild @@ -311,7 +311,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -358,7 +358,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-2.34.1.ebuild b/dev-vcs/git/git-2.34.1.ebuild index 30f56796419f..99934132cd97 100644 --- a/dev-vcs/git/git-2.34.1.ebuild +++ b/dev-vcs/git/git-2.34.1.ebuild @@ -311,7 +311,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -358,7 +358,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-2.35.0_rc1.ebuild b/dev-vcs/git/git-2.35.0_rc1.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-2.35.0_rc1.ebuild +++ b/dev-vcs/git/git-2.35.0_rc1.ebuild @@ -311,7 +311,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -358,7 +358,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -311,7 +311,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -358,7 +358,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -311,7 +311,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -358,7 +358,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -311,7 +311,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -358,7 +358,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -311,7 +311,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -358,7 +358,7 @@ src_compile() { src_install() { git_emake DESTDIR="${D}" install || die "make install failed" - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi