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 40747158020 for ; Wed, 12 Oct 2022 23:33:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86F1DE0870; Wed, 12 Oct 2022 23:33:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 72733E0870 for ; Wed, 12 Oct 2022 23:33:01 +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 B5D9234128F for ; Wed, 12 Oct 2022 23:33:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E51F261D for ; Wed, 12 Oct 2022 23:32:57 +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: <1665617074.4757774468319fcc805c4d3b3b8ee5acaf03bcac.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.33.0-r1.ebuild dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild dev-vcs/git-filter-repo/git-filter-repo-2.34.0-r1.ebuild dev-vcs/git-filter-repo/git-filter-repo-2.34.0.ebuild dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild dev-vcs/git-filter-repo/git-filter-repo-2.38.0.ebuild X-VCS-Directories: dev-vcs/git-filter-repo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4757774468319fcc805c4d3b3b8ee5acaf03bcac X-VCS-Branch: master Date: Wed, 12 Oct 2022 23:32:57 +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: 14b7f4ca-d175-4c33-a676-41e84fa53f95 X-Archives-Hash: d571e6c8f733795e2488097409434d9b commit: 4757774468319fcc805c4d3b3b8ee5acaf03bcac Author: Palmer Dabbelt rivosinc com> AuthorDate: Mon Oct 10 23:41:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 12 23:24:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47577744 dev-vcs/git-filter-repo: Move to distutils-r1, bump to -r1 The new b4 depends on git-filter-repo as a module, not just as a script. This converts git-filter-repo over to distutils-r1, via two hacks: * The package provides a setup.py, but it's not in a standard location. * The github packages don't provide a PKG-INFO so distutils can't find the version, this just makes a minimal one inline. With those I can get git-filter-repo installed as both a script and a module. I've bumped the version of these to -r1 so users get a rebuild with the new files. Signed-off-by: Palmer Dabbelt rivosinc.com> Signed-off-by: Sam James gentoo.org> ...3.0.ebuild => git-filter-repo-2.33.0-r1.ebuild} | 19 +++++++------- ...4.0.ebuild => git-filter-repo-2.34.0-r1.ebuild} | 19 +++++++------- ...8.0.ebuild => git-filter-repo-2.38.0-r1.ebuild} | 29 +++++++++++----------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.33.0-r1.ebuild similarity index 76% rename from dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild rename to dev-vcs/git-filter-repo/git-filter-repo-2.33.0-r1.ebuild index dfc0b43cc287..26a92dc53d0a 100644 --- a/dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild +++ b/dev-vcs/git-filter-repo/git-filter-repo-2.33.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..10} ) -inherit python-single-r1 +inherit distutils-r1 DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)" HOMEPAGE="https://github.com/newren/git-filter-repo/" @@ -20,16 +20,17 @@ RDEPEND=" ${PYTHON_DEPS} >=dev-vcs/git-2.24.0" -src_compile() { - : +S="${S}/release" + +src_prepare() { + eapply_user + cat > PKG-INFO < PKG-INFO <=dev-vcs/git-2.24.0" -src_compile() { - : +S="${S}/release" + +src_prepare() { + eapply_user + cat > PKG-INFO <