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 35AD71382C5 for ; Mon, 22 Mar 2021 10:07:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AE9CE086B; Mon, 22 Mar 2021 10:07:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 65B08E086B for ; Mon, 22 Mar 2021 10:07:05 +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 B199E335D65 for ; Mon, 22 Mar 2021 10:07:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50B995C5 for ; Mon, 22 Mar 2021 10:07:01 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1616407576.cb797361214a6547228ddb23a5c046e14a9fdbe5.soap@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.26.2.ebuild dev-vcs/git/git-2.26.3.ebuild dev-vcs/git/git-2.28.1.ebuild dev-vcs/git/git-2.29.3.ebuild dev-vcs/git/git-2.30.2.ebuild dev-vcs/git/git-2.31.0-r1.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: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: cb797361214a6547228ddb23a5c046e14a9fdbe5 X-VCS-Branch: master Date: Mon, 22 Mar 2021 10:07:01 +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: d310b11e-e316-42fe-b7d0-835cc973159f X-Archives-Hash: 57008eb7ec0d4acae7edd6ba99b1fb29 commit: cb797361214a6547228ddb23a5c046e14a9fdbe5 Author: David Michael gmail com> AuthorDate: Mon Mar 22 10:06:16 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Mar 22 10:06:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb797361 dev-vcs/git: respect toolchain variables with USE=gnome-keyring Closes: https://bugs.gentoo.org/762796 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael gmail.com> Signed-off-by: David Seifert gentoo.org> dev-vcs/git/git-2.26.2.ebuild | 8 ++++++-- dev-vcs/git/git-2.26.3.ebuild | 8 ++++++-- dev-vcs/git/git-2.28.1.ebuild | 8 ++++++-- dev-vcs/git/git-2.29.3.ebuild | 8 ++++++-- dev-vcs/git/git-2.30.2.ebuild | 8 ++++++-- dev-vcs/git/git-2.31.0-r1.ebuild | 8 ++++++-- dev-vcs/git/git-9999-r1.ebuild | 8 ++++++-- dev-vcs/git/git-9999-r2.ebuild | 8 ++++++-- dev-vcs/git/git-9999-r3.ebuild | 8 ++++++-- dev-vcs/git/git-9999.ebuild | 8 ++++++-- 10 files changed, 60 insertions(+), 20 deletions(-) diff --git a/dev-vcs/git/git-2.26.2.ebuild b/dev-vcs/git/git-2.26.2.ebuild index c4ac2f48da9..f4c8b88dbf9 100644 --- a/dev-vcs/git/git-2.26.2.ebuild +++ b/dev-vcs/git/git-2.26.2.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -113,6 +116,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -372,7 +376,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-2.26.3.ebuild b/dev-vcs/git/git-2.26.3.ebuild index 6932d90f123..4bbcac28a0d 100644 --- a/dev-vcs/git/git-2.26.3.ebuild +++ b/dev-vcs/git/git-2.26.3.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -113,6 +116,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -372,7 +376,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-2.28.1.ebuild b/dev-vcs/git/git-2.28.1.ebuild index d725b8e79c3..b52504ad1b2 100644 --- a/dev-vcs/git/git-2.28.1.ebuild +++ b/dev-vcs/git/git-2.28.1.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -113,6 +116,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -372,7 +376,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-2.29.3.ebuild b/dev-vcs/git/git-2.29.3.ebuild index d73a1120a38..a5dd77688d1 100644 --- a/dev-vcs/git/git-2.29.3.ebuild +++ b/dev-vcs/git/git-2.29.3.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -114,6 +117,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -350,7 +354,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-2.30.2.ebuild b/dev-vcs/git/git-2.30.2.ebuild index f6a6fb30a9e..4a85546fc4f 100644 --- a/dev-vcs/git/git-2.30.2.ebuild +++ b/dev-vcs/git/git-2.30.2.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -114,6 +117,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -350,7 +354,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-2.31.0-r1.ebuild b/dev-vcs/git/git-2.31.0-r1.ebuild index bfb176d4710..b3036ae3ffc 100644 --- a/dev-vcs/git/git-2.31.0-r1.ebuild +++ b/dev-vcs/git/git-2.31.0-r1.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -111,6 +114,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -338,7 +342,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index ff37be69674..367d7ed0bed 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -111,6 +114,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -338,7 +342,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index ff37be69674..367d7ed0bed 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -111,6 +114,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -338,7 +342,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index c60eee31d41..2b86230aabe 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -111,6 +114,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -338,7 +342,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index ef8a11391cf..37136eafce0 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl # Common to both DEPEND and RDEPEND DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib @@ -111,6 +114,7 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) + gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) " @@ -338,7 +342,7 @@ src_compile() { if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" popd &>/dev/null || die fi