From e1d95cd8c0944013a250bde528253138bffa2e65 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Jan 2023 05:58:32 +0000 Subject: gentoo auto-resync : 19:01:2023 - 05:58:31 --- dev-util/Manifest.gz | Bin 68585 -> 68579 bytes dev-util/dejagnu/Manifest | 4 +- dev-util/dejagnu/dejagnu-1.6.2.ebuild | 20 --------- dev-util/dejagnu/dejagnu-1.6.3.ebuild | 12 ++--- dev-util/pahole/Manifest | 4 +- dev-util/pahole/pahole-1.24_p20221024.ebuild | 65 +++++++++++++++++++++++++++ dev-util/pahole/pahole-9999.ebuild | 41 ++++++++++++----- 7 files changed, 106 insertions(+), 40 deletions(-) delete mode 100644 dev-util/dejagnu/dejagnu-1.6.2.ebuild create mode 100644 dev-util/pahole/pahole-1.24_p20221024.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index b295ebbe5610..56b9c9c27ce8 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest index 6263ca75a4e2..f8623d812675 100644 --- a/dev-util/dejagnu/Manifest +++ b/dev-util/dejagnu/Manifest @@ -1,5 +1,3 @@ -DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042 DIST dejagnu-1.6.3.tar.gz 622059 BLAKE2B d22d66a233c2643c98f45d260585790b4c1293de2bc84470e7942e0364e0cb15f55888a3b6ab13e82823f4e03198159c93e1904571a5df3fcd6f2da568078726 SHA512 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4 -EBUILD dejagnu-1.6.2.ebuild 520 BLAKE2B 5d35364056aa60b443fef9785257ed648c3493e599c680cfc210e95153cf12282764d97e391d3e115bd5ecffea9f4c618baf90a1847eb2488be94ba8d69d61ef SHA512 d0d23efa9a108005965090718a4102c47c07c6186200d642cbafce55d0982a9e2f5bb1842aa383bf18a5d52a4ee34e87adaaa96a4e37daae061f1df25dd020cb -EBUILD dejagnu-1.6.3.ebuild 595 BLAKE2B ed7f69ec64cd0e83064330ce228844a0ed42f9ab9877626933e261c5f9df6b7ec9a956ea44ca6b9659485e16e2ed2f12f88f07c5445ff6dd21d385e7fe5a31a1 SHA512 acfc28fc9cd72edabd16b7d8986e5ca3b51849feb05afdab03f893ed2c52955bb72074ca408260331d4f20f1b6b43a781ef98e50180858906da30b31cb5303e6 +EBUILD dejagnu-1.6.3.ebuild 556 BLAKE2B 59552c10836df48da9eff8c690925fdb969e541941f19062ba885c1b31218e83e39654965aa8e0e8a1dd4370efe91d5d35c0ad2095d4482538377819bb6d9a21 SHA512 08a6464e55fe8cc8088f5bc6afbe8361defc935dd5a838bced1200b2e6b54cad07045f0dc3029cc4badc25d76dddd1a6fb7c6477f60f1e80a874a458493849e5 MISC metadata.xml 346 BLAKE2B bcd7b010b14ca00937b7241ff66ef048fc645e1724c33e18d12c3a91d6a117889535fdeba947d2c7071ee5b75b85c3354955014ed8b943685df39a3376fa764e SHA512 cc7e8b6ebd769fdf5fabe1009b7ab1fbd5884e6df686121df1e6fc58d1ebea51e3c15b1be7d6f455ddf3142a2e6ac57780d26a34b4421259df5745689ebbe1a8 diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild deleted file mode 100644 index fece44705350..000000000000 --- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Framework for testing other programs" -HOMEPAGE="https://www.gnu.org/software/dejagnu/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -RESTRICT=test # needs fixing - -DEPEND="dev-lang/tcl - dev-tcltk/expect" - -RDEPEND="${DEPEND}" diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild index 4d4a2813baa1..62413d665908 100644 --- a/dev-util/dejagnu/dejagnu-1.6.3.ebuild +++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="test" - -#RESTRICT="!test? ( test )" -RESTRICT="test" # needs fixing +RESTRICT="!test? ( test )" RDEPEND="dev-tcltk/expect" -#DEPEND="test? ( dev-tcltk/expect )" -BDEPEND="app-alternatives/awk" +BDEPEND=" + app-alternatives/awk + test? ( dev-tcltk/expect ) +" 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 -} -- cgit v1.2.3