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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE5C315813A for ; Sat, 11 Jan 2025 06:37:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDB67E0824; Sat, 11 Jan 2025 06:37:36 +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 5AD7AE0824 for ; Sat, 11 Jan 2025 06:37:36 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FB19335CB4 for ; Sat, 11 Jan 2025 06:37:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 774801B33 for ; Sat, 11 Jan 2025 06:37:33 +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: <1736577395.b5a52e4ff39a8485c504f1d449597b40077bf3e6.sam@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.48.0.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b5a52e4ff39a8485c504f1d449597b40077bf3e6 X-VCS-Branch: master Date: Sat, 11 Jan 2025 06:37:33 +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: d1f51003-051f-4495-9e84-304fd63b0bb5 X-Archives-Hash: ee584e01023ae846dc4bc7340f79a773 commit: b5a52e4ff39a8485c504f1d449597b40077bf3e6 Author: Sam James gentoo org> AuthorDate: Sat Jan 11 05:57:16 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 11 06:36:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a52e4f dev-vcs/git: fix USE=mediawiki The Makefile actually gets the Perl handling right so if we let it install first, we already have something in the correct Perl dir, and our mv fails. Just do it afterwards instead. Closes: https://bugs.gentoo.org/947845 Signed-off-by: Sam James gentoo.org> dev-vcs/git/git-2.48.0.ebuild | 8 ++++---- dev-vcs/git/git-9999-r1.ebuild | 12 ++++-------- dev-vcs/git/git-9999-r2.ebuild | 12 ++++-------- dev-vcs/git/git-9999-r3.ebuild | 12 ++++-------- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dev-vcs/git/git-2.48.0.ebuild b/dev-vcs/git/git-2.48.0.ebuild index c90d0aa8bf6a..8d8904831f08 100644 --- a/dev-vcs/git/git-2.48.0.ebuild +++ b/dev-vcs/git/git-2.48.0.ebuild @@ -317,10 +317,6 @@ src_install() { dodoc git-subtree.txt popd &>/dev/null || die - if use mediawiki ; then - git_emake -C contrib/mw-to-git DESTDIR="${D}" install - fi - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -397,6 +393,10 @@ src_install() { dobin contrib/credential/netrc/git-credential-netrc fi + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install + fi + if ! use subversion ; then rm -f "${ED}"/usr/libexec/git-core/git-svn \ "${ED}"/usr/share/man/man1/git-svn.1* diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 41c0ed848010..8d8904831f08 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -148,10 +148,6 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${PN}-2.48.0_rc2-meson-deps.patch -) - pkg_setup() { if use subversion && has_version "dev-vcs/subversion[dso]" ; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" @@ -321,10 +317,6 @@ src_install() { dodoc git-subtree.txt popd &>/dev/null || die - if use mediawiki ; then - git_emake -C contrib/mw-to-git DESTDIR="${D}" install - fi - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -401,6 +393,10 @@ src_install() { dobin contrib/credential/netrc/git-credential-netrc fi + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install + fi + if ! use subversion ; then rm -f "${ED}"/usr/libexec/git-core/git-svn \ "${ED}"/usr/share/man/man1/git-svn.1* diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 41c0ed848010..8d8904831f08 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -148,10 +148,6 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${PN}-2.48.0_rc2-meson-deps.patch -) - pkg_setup() { if use subversion && has_version "dev-vcs/subversion[dso]" ; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" @@ -321,10 +317,6 @@ src_install() { dodoc git-subtree.txt popd &>/dev/null || die - if use mediawiki ; then - git_emake -C contrib/mw-to-git DESTDIR="${D}" install - fi - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -401,6 +393,10 @@ src_install() { dobin contrib/credential/netrc/git-credential-netrc fi + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install + fi + if ! use subversion ; then rm -f "${ED}"/usr/libexec/git-core/git-svn \ "${ED}"/usr/share/man/man1/git-svn.1* diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 41c0ed848010..8d8904831f08 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -148,10 +148,6 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${PN}-2.48.0_rc2-meson-deps.patch -) - pkg_setup() { if use subversion && has_version "dev-vcs/subversion[dso]" ; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" @@ -321,10 +317,6 @@ src_install() { dodoc git-subtree.txt popd &>/dev/null || die - if use mediawiki ; then - git_emake -C contrib/mw-to-git DESTDIR="${D}" install - fi - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -401,6 +393,10 @@ src_install() { dobin contrib/credential/netrc/git-credential-netrc fi + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install + fi + if ! use subversion ; then rm -f "${ED}"/usr/libexec/git-core/git-svn \ "${ED}"/usr/share/man/man1/git-svn.1*