From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1337740-garchives=archives.gentoo.org@lists.gentoo.org>
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 19275158086
	for <garchives@archives.gentoo.org>; Mon,  8 Nov 2021 18:42:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 36181E0997;
	Mon,  8 Nov 2021 18:42:58 +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))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id BE82AE0996
	for <gentoo-commits@lists.gentoo.org>; Mon,  8 Nov 2021 18:42:57 +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 40094342CFF
	for <gentoo-commits@lists.gentoo.org>; Mon,  8 Nov 2021 18:42:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E9641A0
	for <gentoo-commits@lists.gentoo.org>; Mon,  8 Nov 2021 18:42:54 +0000 (UTC)
From: "Mike Gilbert" <floppym@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, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1636396909.0cdd5d6e42a1ebe3f9ae1b6f76ba35cc497240c2.floppym@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.31.1.ebuild dev-vcs/git/git-2.32.0-r1.ebuild dev-vcs/git/git-2.33.1.ebuild dev-vcs/git/git-2.34.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: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 0cdd5d6e42a1ebe3f9ae1b6f76ba35cc497240c2
X-VCS-Branch: master
Date: Mon,  8 Nov 2021 18:42:54 +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: d912204a-5a5d-473c-a7b7-713c09936d38
X-Archives-Hash: df3cd069260149dc98c4a0c9a7d8f3ad

commit:     0cdd5d6e42a1ebe3f9ae1b6f76ba35cc497240c2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 18:40:10 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 18:41:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cdd5d6e

dev-vcs/git: avoid using ${D} before src_install

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-vcs/git/git-2.31.1.ebuild     | 9 ++++-----
 dev-vcs/git/git-2.32.0-r1.ebuild  | 9 ++++-----
 dev-vcs/git/git-2.33.1.ebuild     | 9 ++++-----
 dev-vcs/git/git-2.34.0_rc1.ebuild | 9 ++++-----
 dev-vcs/git/git-9999-r1.ebuild    | 9 ++++-----
 dev-vcs/git/git-9999-r2.ebuild    | 9 ++++-----
 dev-vcs/git/git-9999-r3.ebuild    | 9 ++++-----
 dev-vcs/git/git-9999.ebuild       | 9 ++++-----
 8 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/dev-vcs/git/git-2.31.1.ebuild b/dev-vcs/git/git-2.31.1.ebuild
index decf7398d49..e15dae7192f 100644
--- a/dev-vcs/git/git-2.31.1.ebuild
+++ b/dev-vcs/git/git-2.31.1.ebuild
@@ -291,7 +291,6 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
 		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
 		GIT_TEST_OPTS="--no-color" \
 		OPTAR="$(tc-getAR)" \
 		OPTCC="$(tc-getCC)" \
@@ -364,7 +363,7 @@ src_compile() {
 }
 
 src_install() {
-	git_emake install || die "make install failed"
+	git_emake DESTDIR="${D}" install || die "make install failed"
 
 	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
@@ -414,10 +413,10 @@ src_install() {
 
 	# git-subtree
 	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
 	if use doc ; then
 		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -425,7 +424,7 @@ src_install() {
 
 	if use mediawiki ; then
 		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
+		git_emake DESTDIR="${D}" install
 		popd &>/dev/null || die
 	fi
 

diff --git a/dev-vcs/git/git-2.32.0-r1.ebuild b/dev-vcs/git/git-2.32.0-r1.ebuild
index 3967c829181..d9b4b7cd33e 100644
--- a/dev-vcs/git/git-2.32.0-r1.ebuild
+++ b/dev-vcs/git/git-2.32.0-r1.ebuild
@@ -295,7 +295,6 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
 		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
 		GIT_TEST_OPTS="--no-color" \
 		OPTAR="$(tc-getAR)" \
 		OPTCC="$(tc-getCC)" \
@@ -368,7 +367,7 @@ src_compile() {
 }
 
 src_install() {
-	git_emake install || die "make install failed"
+	git_emake DESTDIR="${D}" install || die "make install failed"
 
 	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
@@ -418,10 +417,10 @@ src_install() {
 
 	# git-subtree
 	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
 	if use doc ; then
 		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -429,7 +428,7 @@ src_install() {
 
 	if use mediawiki ; then
 		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
+		git_emake DESTDIR="${D}" install
 		popd &>/dev/null || die
 	fi
 

diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild
index 6af4b971bc5..6fd30df8050 100644
--- a/dev-vcs/git/git-2.33.1.ebuild
+++ b/dev-vcs/git/git-2.33.1.ebuild
@@ -291,7 +291,6 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
 		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
 		GIT_TEST_OPTS="--no-color" \
 		OPTAR="$(tc-getAR)" \
 		OPTCC="$(tc-getCC)" \
@@ -364,7 +363,7 @@ src_compile() {
 }
 
 src_install() {
-	git_emake install || die "make install failed"
+	git_emake DESTDIR="${D}" install || die "make install failed"
 
 	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
@@ -414,10 +413,10 @@ src_install() {
 
 	# git-subtree
 	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
 	if use doc ; then
 		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -425,7 +424,7 @@ src_install() {
 
 	if use mediawiki ; then
 		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
+		git_emake DESTDIR="${D}" install
 		popd &>/dev/null || die
 	fi
 

diff --git a/dev-vcs/git/git-2.34.0_rc1.ebuild b/dev-vcs/git/git-2.34.0_rc1.ebuild
index 6af4b971bc5..6fd30df8050 100644
--- a/dev-vcs/git/git-2.34.0_rc1.ebuild
+++ b/dev-vcs/git/git-2.34.0_rc1.ebuild
@@ -291,7 +291,6 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
 		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
 		GIT_TEST_OPTS="--no-color" \
 		OPTAR="$(tc-getAR)" \
 		OPTCC="$(tc-getCC)" \
@@ -364,7 +363,7 @@ src_compile() {
 }
 
 src_install() {
-	git_emake install || die "make install failed"
+	git_emake DESTDIR="${D}" install || die "make install failed"
 
 	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
@@ -414,10 +413,10 @@ src_install() {
 
 	# git-subtree
 	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
 	if use doc ; then
 		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -425,7 +424,7 @@ src_install() {
 
 	if use mediawiki ; then
 		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
+		git_emake DESTDIR="${D}" install
 		popd &>/dev/null || die
 	fi
 

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 6af4b971bc5..6fd30df8050 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -291,7 +291,6 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
 		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
 		GIT_TEST_OPTS="--no-color" \
 		OPTAR="$(tc-getAR)" \
 		OPTCC="$(tc-getCC)" \
@@ -364,7 +363,7 @@ src_compile() {
 }
 
 src_install() {
-	git_emake install || die "make install failed"
+	git_emake DESTDIR="${D}" install || die "make install failed"
 
 	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
@@ -414,10 +413,10 @@ src_install() {
 
 	# git-subtree
 	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
 	if use doc ; then
 		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -425,7 +424,7 @@ src_install() {
 
 	if use mediawiki ; then
 		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
+		git_emake DESTDIR="${D}" install
 		popd &>/dev/null || die
 	fi
 

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 6af4b971bc5..6fd30df8050 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -291,7 +291,6 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
 		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
 		GIT_TEST_OPTS="--no-color" \
 		OPTAR="$(tc-getAR)" \
 		OPTCC="$(tc-getCC)" \
@@ -364,7 +363,7 @@ src_compile() {
 }
 
 src_install() {
-	git_emake install || die "make install failed"
+	git_emake DESTDIR="${D}" install || die "make install failed"
 
 	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
@@ -414,10 +413,10 @@ src_install() {
 
 	# git-subtree
 	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
 	if use doc ; then
 		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -425,7 +424,7 @@ src_install() {
 
 	if use mediawiki ; then
 		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
+		git_emake DESTDIR="${D}" install
 		popd &>/dev/null || die
 	fi
 

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 6af4b971bc5..6fd30df8050 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -291,7 +291,6 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
 		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
 		GIT_TEST_OPTS="--no-color" \
 		OPTAR="$(tc-getAR)" \
 		OPTCC="$(tc-getCC)" \
@@ -364,7 +363,7 @@ src_compile() {
 }
 
 src_install() {
-	git_emake install || die "make install failed"
+	git_emake DESTDIR="${D}" install || die "make install failed"
 
 	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
@@ -414,10 +413,10 @@ src_install() {
 
 	# git-subtree
 	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
 	if use doc ; then
 		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -425,7 +424,7 @@ src_install() {
 
 	if use mediawiki ; then
 		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
+		git_emake DESTDIR="${D}" install
 		popd &>/dev/null || die
 	fi
 

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 6af4b971bc5..6fd30df8050 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -291,7 +291,6 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
 		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
 		GIT_TEST_OPTS="--no-color" \
 		OPTAR="$(tc-getAR)" \
 		OPTCC="$(tc-getCC)" \
@@ -364,7 +363,7 @@ src_compile() {
 }
 
 src_install() {
-	git_emake install || die "make install failed"
+	git_emake DESTDIR="${D}" install || die "make install failed"
 
 	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
@@ -414,10 +413,10 @@ src_install() {
 
 	# git-subtree
 	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
 	if use doc ; then
 		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -425,7 +424,7 @@ src_install() {
 
 	if use mediawiki ; then
 		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
+		git_emake DESTDIR="${D}" install
 		popd &>/dev/null || die
 	fi