From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1446518-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 82135158020
for <garchives@archives.gentoo.org>; Wed, 12 Oct 2022 23:33:03 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 699C5E0893;
Wed, 12 Oct 2022 23:33:02 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 47D37E08A2
for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2022 23:33:02 +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 2E0093412A4
for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2022 23:33:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 29F7A620
for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2022 23:32:58 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1665617522.538ebda96d47ee65043d1d9195f0fec1c4175712.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-filter-repo/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
X-VCS-Directories: dev-vcs/git-filter-repo/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 538ebda96d47ee65043d1d9195f0fec1c4175712
X-VCS-Branch: master
Date: Wed, 12 Oct 2022 23:32:58 +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: 9edf06ca-350d-45a0-9911-bfd756d8a13b
X-Archives-Hash: c952365ccb5ea2dc562bfe419395afc1
commit: 538ebda96d47ee65043d1d9195f0fec1c4175712
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 23:27:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 23:32:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538ebda9
dev-vcs/git-filter-repo: misc tweaks
- Depend on same git version as $(ver_cut 1-2) (we could arguably do 1-3, but..)
- Use python_prepare_all
- Tidy up PKG-INFO a tiny bit wrt indentation
- Fix README.md installation
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../git-filter-repo-2.38.0-r1.ebuild | 35 ++++++++++++++--------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
index 26a92dc53d0a..321bde43f057 100644
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,29 +8,40 @@ inherit distutils-r1
DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
HOMEPAGE="https://github.com/newren/git-filter-repo/"
-SRC_URI="
- https://github.com/newren/git-filter-repo/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI="https://github.com/newren/git-filter-repo/releases/download/v${PV}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- >=dev-vcs/git-2.24.0"
+ >=dev-vcs/git-$(ver_cut 1-2)
+"
S="${S}/release"
-src_prepare() {
- eapply_user
- cat > PKG-INFO <<EOF
-Metadata-Version: 2.1
-Name: git-filter-repo
-Version: ${PV}
-EOF
+python_prepare_all() {
+ cat > PKG-INFO <<-EOF || die
+ Metadata-Version: 2.1
+ Name: git-filter-repo
+ Version: ${PV}
+ EOF
+
+ distutils-r1_python_prepare_all
}
src_test() {
bash t/run_tests || die
}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # Points to dead symlink
+ rm "${ED}"/usr/share/doc/${PF}/README.md || die
+ rmdir "${ED}"/usr/share/doc/${PF} || Die
+
+ dodoc "${WORKDIR}"/${P}/README.md
+}