gentoo auto-resync : 19:01:2023 - 05:58:31

3 files changed, 99 insertions, 11 deletions

diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 1d30767115f4..5e4ac88c2d57 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -1,7 +1,9 @@
 AUX pahole-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
 DIST dwarves-1.23.tar.xz 815076 BLAKE2B 2d89ac2d8cacb70a322b1c946356c0b18a2276f7a549efc2cf530c087dd718c7d01f5bcf8b9208965e066770064b6d8db7a9f6ab9a3f3a4612f6fcc8d146c1e8 SHA512 5255930d6898ce35a41e3e553363964663d2b686d12732ff6140fa1d06fcc3806adf28e24ec35ab0712eec0562c52c3943afe9ecce468b0053b852ffeb04c3dc
 DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
+DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f568257f42164952e170b952e4893a92d769e17ce4cf0de88b727808a38195438fe10e5537f245bf101f647f383b6df7642c5446fa5d45 SHA512 93f160f01023c5402535a34d59005f0a3e056662a2764722480d71b6e522f3bfef0d642084467d1fbea96e23386b4cbb708243713d59eb84f4f767c1ac5ab3f5
 EBUILD pahole-1.23.ebuild 1093 BLAKE2B fb7f97012a131093123ecd97e5800a0de8c653a6c8095906781b44da88d4412d888704c5e924ebce1a9ee888db356cd5cf23a2c7da159ca9db3c0298ecd19193 SHA512 0bc03b41b3edab165a7bd25a2660310bf75548ee56f404808df5ed1002b200f21a6741110669930decd93ea8554cbe9243330dc4cdd4a8d04d34413e0a7aebed
 EBUILD pahole-1.24.ebuild 1089 BLAKE2B fc944b60897285106af282a7fb54a5b21cd027ce41f63b3dec854178447bec28360af4d4a396618c7820c9b5e76e033f920236ea1141668532638589e64ee229 SHA512 16af24361e6dbbf19a38bc09baeb8b899056687d72d4ab6257c838f40b471bc318c2b7eaa12f91aaa05ed54924bc1d0b273722e52be41fe02bd9bdd743e7d92c
-EBUILD pahole-9999.ebuild 902 BLAKE2B 656b7cdb4b94bfa6e3dcc3503b0e908873e04782d9f91cb8d6ce8176dcb513e68343da79ebccd2d6c49a60d67926a00fdf8cd697b4589693d22a6cd2d144c96a SHA512 53460af56af1f33e295d77a5b15b73074ec3a9ce3be9672c53249855984d732670036f078a4b6c5f6404ec4beadfefd0f5e0ffc8eeeaa451bcd26fae39944e3c
+EBUILD pahole-1.24_p20221024.ebuild 1698 BLAKE2B ae7281d783be25d0d5cf060986e75cd7d1df973ddea10be0173306f36e258edb79e5d441f5b9262b51bd758a20217294411d3b7b3f67f8d039f9f2eb8d134439 SHA512 0afbe223fa78b2c40e8cc253582768338fa23ce76cf307157696e7cf0239cf305755f8e525c051e15ac117ea04fdd279948d6dbf9f0b9163173bcf2ab895fb5e
+EBUILD pahole-9999.ebuild 1698 BLAKE2B ae7281d783be25d0d5cf060986e75cd7d1df973ddea10be0173306f36e258edb79e5d441f5b9262b51bd758a20217294411d3b7b3f67f8d039f9f2eb8d134439 SHA512 0afbe223fa78b2c40e8cc253582768338fa23ce76cf307157696e7cf0239cf305755f8e525c051e15ac117ea04fdd279948d6dbf9f0b9163173bcf2ab895fb5e
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.24_p20221024.ebuild b/dev-util/pahole/pahole-1.24_p20221024.ebuild
new file mode 100644
index 000000000000..5d98a672167d
--- /dev/null
+++ b/dev-util/pahole/pahole-1.24_p20221024.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-single-r1
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Snapshots
+	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+
+	# Patch rollups from git format-patch. Sometimes there are important
+	# fixes in git which haven't been released (and no release in sight).
+	# Patch rollups are a bit better for understanding where changes have
+	# come from for users.
+	SRC_URI="
+		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
+	"
+	S="${WORKDIR}"/${MY_P%%_p*}
+else
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-2" # only
+SLOT="0"
+IUSE="debug"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+)
+
+src_prepare() {
+	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
+
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
diff --git a/dev-util/pahole/pahole-9999.ebuild b/dev-util/pahole/pahole-9999.ebuild
index 2b542cf4434e..5d98a672167d 100644
--- a/dev-util/pahole/pahole-9999.ebuild
+++ b/dev-util/pahole/pahole-9999.ebuild
@@ -1,19 +1,44 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake python-single-r1 git-r3
+inherit cmake python-single-r1
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Snapshots
+	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+
+	# Patch rollups from git format-patch. Sometimes there are important
+	# fixes in git which haven't been released (and no release in sight).
+	# Patch rollups are a bit better for understanding where changes have
+	# come from for users.
+	SRC_URI="
+		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
+	"
+	S="${WORKDIR}"/${MY_P%%_p*}
+else
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}"/${MY_P}
+fi
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS=""
 IUSE="debug"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -28,6 +53,8 @@ PATCHES=(
 )
 
 src_prepare() {
+	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
+
 	cmake_src_prepare
 	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
 }
@@ -36,9 +63,3 @@ src_configure() {
 	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
 	cmake_src_configure
 }
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}