From 18ca39598fb9e5a05f37adb077234a4e292d9f6d Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 29 Apr 2022 21:06:26 +0900 Subject: [PATCH] Revert "dev-util/pahole: Add from gentoo" This reverts commit 4f1a92e5ae3254b6b63e683b714361df35b11162. --- .../portage-stable/dev-util/pahole/Manifest | 3 -- .../files/pahole-1.10-python-import.patch | 15 ------ .../dev-util/pahole/metadata.xml | 16 ------ .../dev-util/pahole/pahole-1.20.ebuild | 52 ------------------- .../dev-util/pahole/pahole-1.21.ebuild | 52 ------------------- .../dev-util/pahole/pahole-1.22.ebuild | 52 ------------------- .../dev-util/pahole/pahole-9999.ebuild | 44 ---------------- 7 files changed, 234 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pahole/files/pahole-1.10-python-import.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pahole/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest deleted file mode 100644 index 795a1994d3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817 -DIST dwarves-1.21.tar.xz 910480 BLAKE2B b6dcdaf008a7714838904b0bc1050e6af4617e00e168f45a3f1a5d4611a05c898182f3395b2f10478240e05c22ce82a3a7381a1ea7ab41684e3b05ea6e73620c SHA512 69f510025f5790a004c356546f7d92996ad84c4ff1636876b48f1c7d81bf66c83da70f11a1912d65b46f81bea79418782021396a018e74baae5cad9221af14e1 -DIST dwarves-1.22.tar.xz 922016 BLAKE2B 79ba94bcbec6ddc9ebcc6d9e72ed63c8704ca9a97bb3df1910114e89cdd4e7cc75024e4281f15f06be8f5b4656dd957a44d561a16beff1af14d8c7dc32fbd184 SHA512 d45b19505cd59eb2cbb42304ab599661355a4085262cb202757822ec1c05476c851dea85e922f9421efb8a978ab475a6a6545757c6ab080f13ac77c5f7186606 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/files/pahole-1.10-python-import.patch b/sdk_container/src/third_party/portage-stable/dev-util/pahole/files/pahole-1.10-python-import.patch deleted file mode 100644 index e308ac6e27..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/files/pahole-1.10-python-import.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=423817 - ---- dwarves-1.10/ostra/ostra-cg -+++ dwarves-1.10/ostra/ostra-cg -@@ -10,7 +10,9 @@ - # under the terms of version 2 of the GNU General Public License as - # published by the Free Software Foundation. - --import sys, datetime, os, ostra -+import sys -+sys.path.insert(0, "/usr/share/dwarves/runtime/python") -+import datetime, os, ostra - - class_def = None - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/pahole/metadata.xml deleted file mode 100644 index 0506bdfe74..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - zzam@gentoo.org - Matthias Schwarzott - - - The more-than-seven dwarves is a collection of tools that allows - to inspect and query the DWARF2 information present in ELF files - built with full debug information. These tools include pahole - (Poke-a-hole) and codiff, and were originally designed to inspect - the Linux kernel and its modules, but can be used in for - user-space software too. - - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild deleted file mode 100644 index 40eb52fc5c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit multilib cmake python-single-r1 - -DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" -HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" - -LICENSE="GPL-2" # only -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" -IUSE="debug" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/elfutils-0.178 - sys-libs/zlib" -DEPEND="${RDEPEND}" - -MY_PN=dwarves -MY_P=${MY_PN}-${PV} -S=${WORKDIR}/${MY_P} -if [[ ${PV//_p} == ${PV} ]]; then - SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz" -else - SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" -fi - -DOCS=( README README.ctracer NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.10-python-import.patch -) - -src_prepare() { - cmake_src_prepare - python_fix_shebang ostra/ostra-cg ostra/python/ostra.py -} - -src_configure() { - local mycmakeargs=( "-D__LIB=$(get_libdir)" ) - cmake_src_configure -} - -src_test() { :; } - -src_install() { - cmake_src_install -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild deleted file mode 100644 index 6e645bb830..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit multilib cmake python-single-r1 - -DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" -HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" - -LICENSE="GPL-2" # only -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="debug" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/elfutils-0.178 - sys-libs/zlib" -DEPEND="${RDEPEND}" - -MY_PN=dwarves -MY_P=${MY_PN}-${PV} -S=${WORKDIR}/${MY_P} -if [[ ${PV//_p} == ${PV} ]]; then - SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz" -else - SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" -fi - -DOCS=( README README.ctracer NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.10-python-import.patch -) - -src_prepare() { - cmake_src_prepare - python_fix_shebang ostra/ostra-cg ostra/python/ostra.py -} - -src_configure() { - local mycmakeargs=( "-D__LIB=$(get_libdir)" ) - cmake_src_configure -} - -src_test() { :; } - -src_install() { - cmake_src_install -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild deleted file mode 100644 index 6e645bb830..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit multilib cmake python-single-r1 - -DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" -HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" - -LICENSE="GPL-2" # only -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="debug" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/elfutils-0.178 - sys-libs/zlib" -DEPEND="${RDEPEND}" - -MY_PN=dwarves -MY_P=${MY_PN}-${PV} -S=${WORKDIR}/${MY_P} -if [[ ${PV//_p} == ${PV} ]]; then - SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz" -else - SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" -fi - -DOCS=( README README.ctracer NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.10-python-import.patch -) - -src_prepare() { - cmake_src_prepare - python_fix_shebang ostra/ostra-cg ostra/python/ostra.py -} - -src_configure() { - local mycmakeargs=( "-D__LIB=$(get_libdir)" ) - cmake_src_configure -} - -src_test() { :; } - -src_install() { - cmake_src_install -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild deleted file mode 100644 index 7ce8b9b051..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit multilib cmake python-single-r1 git-r3 - -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" - -LICENSE="GPL-2" # only -SLOT="0" -KEYWORDS="" -IUSE="debug" -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() { - cmake_src_prepare - python_fix_shebang ostra/ostra-cg ostra/python/ostra.py -} - -src_configure() { - local mycmakeargs=( "-D__LIB=$(get_libdir)" ) - cmake_src_configure -} - -src_test() { :; } - -src_install() { - cmake_src_install -}