summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/Manifest.gzbin69446 -> 69446 bytes
-rw-r--r--dev-util/cmake/Manifest5
-rw-r--r--dev-util/cmake/cmake-3.25.0.ebuild294
-rw-r--r--dev-util/flatpak-builder/Manifest4
-rw-r--r--dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild43
-rw-r--r--dev-util/flatpak-builder/flatpak-builder-1.2.2-r1.ebuild (renamed from dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild)2
-rw-r--r--dev-util/geany-plugins/Manifest2
-rw-r--r--dev-util/geany-plugins/geany-plugins-1.38-r4.ebuild (renamed from dev-util/geany-plugins/geany-plugins-1.38-r3.ebuild)1
-rw-r--r--dev-util/perf/Manifest11
-rw-r--r--dev-util/perf/files/perf-5.15-clang.patch231
-rw-r--r--dev-util/perf/files/perf-5.17.1-clang.patch61
-rw-r--r--dev-util/perf/perf-5.15-r1.ebuild266
-rw-r--r--dev-util/perf/perf-5.17.1.ebuild264
-rw-r--r--dev-util/perf/perf-5.18.ebuild264
-rw-r--r--dev-util/perf/perf-5.19.ebuild2
15 files changed, 305 insertions, 1145 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 63de3d29a61b..445157a25259 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2e387640c4d6..c1f423f57d0f 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,8 +19,13 @@ DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6
DIST cmake-3.24.3-SHA-256.txt.asc 833 BLAKE2B f8797072c2d30facfbbebc972c68cd1a6510331e63c67e6b665bd97dd9013e354bab68e03d578698d2f9e50c173ff8e1cac40751c7a3645be294a717f4bfee3a SHA512 bc67eaf6dba935df85ae3d7c37600259b032579813b275087332d5cc4c72dd6bdf44762260729a15f237f69f772670291bb2f2dcc4b155fb17112e0e8fa01d6b
DIST cmake-3.24.3-docs.tar.xz 492156 BLAKE2B 92edd031189673c46e8e13a5e1200917734b918651dc01d982c25602e48cd5d5f014fa8563bdc79b3d09d90ef07a52c9d5a570a5181c59c233ba5bf450cdd5df SHA512 75806743fca976098b9b7ee777c494478142ab5686dc8ccb18510b5938c7e88cf8b3bc47321022f55f33c04bb0a7f549d70be8c765d1ec143467e679c8863132
DIST cmake-3.24.3.tar.gz 10399876 BLAKE2B 24e2ff8cf4f63ba182dd305c14367fa0163f6187da84f7ec10b1ad6241c7df5b48f329b67ba5f7b5d3b644cba89c7adb848a3ae7196bf5b4dbfaedf178dba250 SHA512 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764
+DIST cmake-3.25.0-SHA-256.txt 1646 BLAKE2B 0408c43f36777473c0df229059d6508990a01535f5b3b8d3ae3b1cda221abab5cc2d37dc655de44a581a4b18b3ef73e920c20921d649a9149b7307b9d548ba6a SHA512 8b73a55837e86fa2e166a12041558cc45d1910514c9a1d63398758a99d76687f13f0c8b5244b89297bd890776a5c286a20e278361eefa0bf8db136744ba76515
+DIST cmake-3.25.0-SHA-256.txt.asc 833 BLAKE2B 1424ff89c7ae68352daddbdb810e818020bdd0979fac32de98839cea510ffb8d30a517327f1853d59bf83f846ccde528d07ed624e55c1b1f185551e4f7bc47d6 SHA512 354f7fbb3597eed8f0d94a496cac13b8d9301576b23bf85fcd5d14b84f2848d96534e2c827f7311a00043da789b4160adad805717f110cfc4677d585691e7e55
+DIST cmake-3.25.0-docs.tar.xz 499744 BLAKE2B d6bfb6f58bab66e0b444206c93a03c10e084f7326c9ecdc7a1a2c5ccd79e4d6403eff92989e05883e5985782dd93e9daea19e773a7fefdfb3808deda0546288b SHA512 7c382bd837f808fbfe3c665c2294ba935f20f62acf24c46c760d79f252b3e26f7ff70c75cdd802bfe9fc65ef73a560ce686caa53a4516c1071800f1ce2285285
+DIST cmake-3.25.0.tar.gz 10560389 BLAKE2B 182983a7fc2eedcbd369fef1b1cd118044abcd1679870ca301f3aa8c0ddebd7cb509ae843d0f7a9847b2b54f79235c3407efd47b6a4684c010b6a3b030e1db4b SHA512 f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c
EBUILD cmake-3.23.3.ebuild 7786 BLAKE2B 5157538dc24bf0f62f89c532d5cefa4725687e875780d10da41ac4c0f7c52e5f9008b8428c40da4a01ca1babc61a6fdde8656572dba67acff515e1477a789c7b SHA512 bad1b24104f29b4997800b775989a82bd5d4d7e3f26382a595f16021b98cd096ac345b4cbe5d67b7a243157d3c1dd0301594673192e06ce02579abd16827a3a2
EBUILD cmake-3.24.2.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
EBUILD cmake-3.24.3.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
+EBUILD cmake-3.25.0.ebuild 8862 BLAKE2B f4bd3a7293d144915c1e53b522d335bd802480e01744c893cbee4a5dfe69e5da62dfcd0b0e4443813b91cd2cafbca645c9eadfe709f3208ca8cdf765ed8aa604 SHA512 681d9a8773ed09cefa721e62aafba53f75f400f65841b723b473a4f26878a7ec1d5a106b43c3da787a3a827f03f061cd19ce3a41c568479f102ac775cd1c0e78
EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.25.0.ebuild b/dev-util/cmake/cmake-3.25.0.ebuild
new file mode 100644
index 000000000000..38731f6c70e1
--- /dev/null
+++ b/dev-util/cmake/cmake-3.25.0.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+ toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+ CMAKE_DOCS_PREBUILT=0
+
+ EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+ inherit git-r3
+else
+ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+ if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+ fi
+
+ if [[ ${PV} != *_rc* ]] ; then
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+ inherit verify-sig
+
+ SRC_URI+=" verify-sig? (
+ https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+ https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+ )"
+
+ # Briefly unkeyworded for further testing
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
+ fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-arch/libarchive-3.3.3:=
+ app-crypt/rhash
+ >=dev-libs/expat-2.0.1
+ >=dev-libs/jsoncpp-1.9.2-r2:0=
+ >=dev-libs/libuv-1.10.0:=
+ >=net-misc/curl-7.21.5[ssl]
+ sys-libs/zlib
+ virtual/pkgconfig
+ emacs? ( >=app-editors/emacs-23.1:* )
+ ncurses? ( sys-libs/ncurses:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+ doc? (
+ dev-python/requests
+ dev-python/sphinx
+ )
+ test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ # Prefix
+ "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+ "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+ # Handle gentoo packaging in find modules
+ "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+ # Next patch needs to be reworked
+ #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+ # Respect python eclasses
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+ "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+ # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+ # disable running of cmake in bootstrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # execinfo.h on Solaris isn't quite what it is on Darwin
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i -e 's/execinfo\.h/blablabla.h/' \
+ Source/kwsys/CMakeLists.txt || die
+ fi
+
+ # bootstrap script isn't exactly /bin/sh compatible
+ tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+ || die "Bootstrap failed"
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+ default
+ else
+ cd "${DISTDIR}" || die
+
+ # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+ verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+ verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+ cd "${WORKDIR}" || die
+
+ default
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # Disable Xcode hooks, bug #652134
+ sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+ Source/CMakeLists.txt || die
+ sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+ -e '/cmGlobalXCodeGenerator.h/d' \
+ Source/cmake.cxx || die
+
+ # Disable isysroot usage with GCC, we've properly instructed
+ # where things are via GCC configuration and ldwrapper
+ sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+ Modules/Platform/Apple-GNU-*.cmake || die
+ # Disable isysroot usage with clang as well
+ sed -i -e '/_SYSROOT_FLAG/d' \
+ Modules/Platform/Apple-Clang.cmake || die
+ # Don't set a POSIX standard, system headers don't like that, #757426
+ sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+ Source/cmLoadCommandCommand.cxx \
+ Source/cmStandardLexer.h \
+ Source/cmSystemTools.cxx \
+ Source/cmTimestamp.cxx
+ sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+ Source/cmStandardLexer.h
+ fi
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+ if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+ CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+ cmake_src_bootstrap
+ fi
+}
+
+src_configure() {
+ # Fix linking on Solaris
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+ # ODR warnings, bug #858335
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+ filter-lto
+
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ -DSPHINX_MAN=$(usex doc)
+ -DSPHINX_HTML=$(usex doc)
+ -DBUILD_CursesDialog="$(usex ncurses)"
+ -DBUILD_TESTING=$(usex test)
+ )
+ use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+ # Fix OutDir and SelectLibraryConfigurations tests
+ # these are altered thanks to our eclass
+ sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+ || die
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # BundleUtilities: bundle creation broken
+ # CMakeOnly.AllFindModules: pthread issues
+ # CTest.updatecvs: which fails to commit as root
+ # Fortran: requires fortran
+ # RunCMake.CompilerLauncher: also requires fortran
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+ # debugedit binary is not in the expected location
+ # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+ # it can't find a deb package that owns libc
+ # TestUpload, which requires network access
+ # RunCMake.CMP0125, known failure reported upstream (bug #829414)
+ local myctestargs=(
+ --output-on-failure
+ -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+ )
+
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ # If USE=doc, there'll be newly generated docs which we install instead.
+ if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+ fi
+
+ if use emacs; then
+ elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Auxiliary/vim/syntax/cmake.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Auxiliary/vim/indent/cmake.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${PN}.vim"
+
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+
+ if use qt5; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+
+ if use qt5; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
diff --git a/dev-util/flatpak-builder/Manifest b/dev-util/flatpak-builder/Manifest
index 4dac70541742..63da5986309f 100644
--- a/dev-util/flatpak-builder/Manifest
+++ b/dev-util/flatpak-builder/Manifest
@@ -1,7 +1,5 @@
AUX flatpak-builder-1.0.11-musl.patch 626 BLAKE2B 83899e982e24f4045af7c494b92373eb712e9e34415bb4cf6a8f00edf8d08dc999e0f10e52fea03bf56d200b2a7503d2c8a85a54e5c9af76ea58739b8baaf339 SHA512 32595a1e9ef8e5693c69882849e89d66438f3bb36d9e2c2a4db2b1d84835636ed2db49703b18ead616df68aee8509cc5a1d4074ff49616134294d4a9f77b2a2a
AUX flatpak-builder-1.2.2-musl.patch 1977 BLAKE2B d6e9374fcd7249c206714beb1f14f856d41576ea04cf4e27779dfc95dbef7def2f27e5183518d930ef34bf111ba4264188bef6e78169227e0f8a59d479ffc842 SHA512 a63f6df29d0045e13796a7c7b033bad1941411f84018b05479e3ffa14bada0826e891fd8e83b9e3df741c27d8954893bb85070be69e92ff3de48904746886100
-DIST flatpak-builder-1.0.11.tar.xz 459500 BLAKE2B aa5edebaa6a52a7dbf5cd68bfc356617e13556036979575369ee65e919b267f0ec6838524668793c394b9024f97309d71ceb094c26e3893dedc8884ea8d18d1f SHA512 27c15ecccee79c6a7545f11d7c8cd7b80d4e99dc9c48818dd722934dfbe61e02b258b3db59946badfe5e1e189b39b509a2dbff1404a31a42c29ed4993fb5ec26
DIST flatpak-builder-1.2.2.tar.xz 503444 BLAKE2B f499d5a5bb313530b2a5c69c2aef897aead40e959495ee368f375e03b9bca3c224b377607d1ca213f8640b0f926d7b862b0a7502e1773661a8e5ee983340f53c SHA512 28ab004f5c4fdb7f43b7d3f0823d54dad0aa4f660d5bbe9969e0ce011a1e338e2442e676d1d4c197af60d61a0911b8715ba34244b547116887bbcdef589e1b47
-EBUILD flatpak-builder-1.0.11.ebuild 907 BLAKE2B 2f134f02ecf3371956c756d63920be5ddca46f4de07cdca25aff2b5fb48bad7215d99a015788067529cc67a8130752a49aa83d6a62f3d62cb8c73e580348a07f SHA512 f545a6ba6bf0f689761a4ef2d670213939be7eaf20bd93f27127dd0bccdd8712d4a2b482037bcdd26e87e690a8daac4f96c02a178e3af94c36414bca75f7255e
-EBUILD flatpak-builder-1.2.2.ebuild 906 BLAKE2B cfbe124731f52e2a00564a25c0df26c01fd56c0cc1d080177f741c3acc4725ef40f6575768df4182e0ebd6fdc206c70a5a2e2ef771daf2eeeb356515cbac0b28 SHA512 ee5d845726d7c0b7e57105c38ba8d8e462fdc76811f758f55f50fde84b84f1ec0cc533722c9e19ef7321c5b074cd89169e7eb784857ef0d698eaf0afb3c4067c
+EBUILD flatpak-builder-1.2.2-r1.ebuild 909 BLAKE2B 10000ebcc5e6712ae3aef22f625ada14638a8edfc756d01da9bdf6da0a4461cc1fd3c3b1428da86ea5a17d8016b3b5dc857c6422ea015a378222c11e556f3b7c SHA512 a82380387b7239588033221120992bccf2dd531b517a715e38d0407f7bcb1aea5e55f249f30325e1c9509ff8088ef1ae33d73c0b9867445173ef76b8da6f3266
MISC metadata.xml 404 BLAKE2B 6dbef666c9bbd3347d28811890ab5b9ab1ebdf60895dc2d8146a88374a0c348706656e9758a92eaeb47bfa86f833313d669530460a1ee6ca7f81da1db542fb95 SHA512 bfb8bc1b79690c44e7e8171035e326bccc96e1df26d7fe12515e26290ef68b64f6eef1e86ab24530ea6b2c9cfc3240f1587b0d7c21686fdecf9ee8e53144b42b
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
deleted file mode 100644
index 20d616e0056d..000000000000
--- a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Tool to build flatpaks from source"
-HOMEPAGE="http://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +yaml"
-
-RDEPEND="
- >=sys-apps/flatpak-0.99.1
- >=dev-util/ostree-2019.5:=
- >=net-libs/libsoup-2.4:=
- >=dev-libs/elfutils-0.8.12:=
- >=dev-libs/glib-2.44:2=
- >=dev-libs/libxml2-2.4:=
- dev-libs/json-glib:=
- net-misc/curl:=
- yaml? ( dev-libs/libyaml:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=sys-devel/gettext-0.18.2
- virtual/pkgconfig
- doc? (
- app-text/xmlto
- dev-libs/libxslt
- )
-"
-
-PATCHES=("${FILESDIR}/flatpak-builder-1.0.11-musl.patch")
-
-src_configure() {
- econf \
- $(use_enable doc documentation) \
- $(use_enable doc docbook-docs) \
- $(use_with yaml)
-}
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.2.2-r1.ebuild
index f135df85fc71..262070de405e 100644
--- a/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild
+++ b/dev-util/flatpak-builder/flatpak-builder-1.2.2-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="doc +yaml"
RDEPEND="
>=sys-apps/flatpak-0.99.1
>=dev-util/ostree-2019.5:=
- >=net-libs/libsoup-2.4:=
+ >=net-libs/libsoup-2.4:2.4=
>=dev-libs/elfutils-0.8.12:=
>=dev-libs/glib-2.44:2=
>=dev-libs/libxml2-2.4:=
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 8cbda3bcc44d..5c2e0a87a4d7 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,5 @@
AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
EBUILD geany-plugins-1.38-r1.ebuild 2910 BLAKE2B 76181571b98ee1e7296a5f2859aea3b0acb51cda51fb729e670ea9c4d3818377b5d9d54d8399a9af866a0451b82fea5198cc13eb9b233682357b64849a14bbbb SHA512 e7f18ef4f0f9ba326050e9ff48aed4bd3a493be4d71ede5e76da1952c870b78c8c56d1d9cb5401b8fdec0cf0cf2248e11e84cb5aee7f32c266dbe24441460f89
-EBUILD geany-plugins-1.38-r3.ebuild 3149 BLAKE2B 87ecf0359f05615c1245276a07e4124d4a525804bd346a325b2062051f3dd652737d64531f37f7aa7c1625b3869c6f9a81d23b0bdc071564940d2ec58f7a145b SHA512 4f21de3e93bcca6057ae70433a8c85a0cb7406611969654f1f2ac0df65c9e095863d0188d2096ee1e15a27874c00fd422bc8ccfb4635e74da8aa453040aef8d3
+EBUILD geany-plugins-1.38-r4.ebuild 3174 BLAKE2B d8336765ae2e3197f677412e64099f0dc2d02c45c2da38ba4e02b7559a49560c4658d5982da8bf741a379af0a644085d1998e30f4fc832f8841b5007fde43008 SHA512 95841796cb97a8a75d056a66ae0e4a8f3b5e38079aceed9a47e06ccc78eb1d663f03821a1550b6ef4cb44010669e67558b8ee583df162ef7e8ac6fe1c3298eca
MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r3.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r4.ebuild
index f74c64c1a2e0..22a9b9b191dd 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r3.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.38-r4.ebuild
@@ -4,6 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
inherit flag-o-matic lua-single
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 58dac48464bd..09d344442f5d 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,17 +1,8 @@
-AUX perf-5.15-clang.patch 8700 BLAKE2B cfe9ab41fc2ac49d2d7cbdfe2a4b009dc1c0dad93fb1a54e5ed541208afccb2f55ae420db6321ac360c5b2f6351b04f458fff21abd581d4da5e3296608c3b3da SHA512 49a88809100bdd63241064a8b19e866ba2d91dc78dd279c979982cbb96e91061f6a93ded1a596364f1d7b3410ed10811ae21c23b046370654c3f32c9d0d468cc
-AUX perf-5.17.1-clang.patch 2350 BLAKE2B 5010e3f90feafdd340b49000f2140857e8511a771acafa017224242f1a7361abd9a60a698923288dc13d53d8346985e40a069469dc1ca346b5b7ae058622322d SHA512 03086f968bdd31a9545a45c92d461f1ad9bc62d0fbd6de8b726925f422e436ab71002cafeadb7540bba0be553b426fe5e5b69e895f974497c6777354987ad375
AUX perf-5.18-clang.patch 1858 BLAKE2B 04c8306f29f2fbb273f622ff046162a2e41eac9e588744b72bb2e5e8953063d2b620eec4779cdf96cf82d0198986586c1006491f3a58aa763f6234db84500a02 SHA512 1700bf25766dbe850683797279ebc4ab5b9c5bf6268de100377a473893e250e556a20f150db3e94a9d157007cb00380a0a9e209b1c5fad132dff7ce9584a76da
AUX perf-6.0-clang.patch 1862 BLAKE2B e88655e51cb785b80cd44fefb73bb7668bf6d57205e478b106a0d0fbbee4e7089850c2328e796530347c354eb8e7e46e947c18e03ded488bede41de5f74f0b8e SHA512 0e92ba2e878b2b20f6d7c30ba5fde43388378c7f8e752a7c07dd65abc66e576be8f74cf9c06abb79713cc8c1cab37c9cd678f4e5bba8bb99ed1020317f278eb2
-DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
-DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
-DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
-EBUILD perf-5.15-r1.ebuild 7402 BLAKE2B 34680ee1fa303907add5dec4f041a978e41c5812bdef05141b6e4d3f8a31d984166788c6250f18ebcf6e4f6b4b4b55a71187d6084c149c7b2e684a470658a30b SHA512 c9395d36355c5bb83a28cfbefeab508baf1fd1a35fc817107a28000ef46f4c631893077d82218b9bc9949d5bf28ea633f657b40e91b1974a0093619388f410d7
-EBUILD perf-5.17.1.ebuild 7333 BLAKE2B 0d41316a6c0b736f5250af84d7e39ac69e9670b54ee46965f7a80de5bb64eb0e7b45e9e1ec8288850c853db035506269bba409ce4900481532f2c0384e84d77f SHA512 459add81f9fe2b917908286186bbad5e65253483b5b9e40983e6edb2cb1a1eba42682c815f73b25ae31e7ef8fd2a8b54efe4c1f3464677517d80b5a2282c1d72
-EBUILD perf-5.18.ebuild 7333 BLAKE2B 0d41316a6c0b736f5250af84d7e39ac69e9670b54ee46965f7a80de5bb64eb0e7b45e9e1ec8288850c853db035506269bba409ce4900481532f2c0384e84d77f SHA512 459add81f9fe2b917908286186bbad5e65253483b5b9e40983e6edb2cb1a1eba42682c815f73b25ae31e7ef8fd2a8b54efe4c1f3464677517d80b5a2282c1d72
-EBUILD perf-5.19.ebuild 7956 BLAKE2B 1a2424aaedd6411defa0fbfb70c55ab759239149f501a9b98a72fed2dfba26fcaaf1d6ba0b70ab973f71ea30dfe91304b14d070edc4c0a9f40ff711101296f2d SHA512 b965e3c419fd440dfc0287fb69f7d73efde6f590d0c384ddc255247502b06113b66a376a6585f6c0b76ccc239aeaf5b53be04fdf63fbaab011f465da15b79639
+EBUILD perf-5.19.ebuild 7955 BLAKE2B 23485624229d577c2c97f5009b715397be75dd5f7b672124e1282635293a0104905b7d1453f7e725231b88862a6d5060592e9d1d4fd37a744979ecdc5375b1e8 SHA512 eb86385d7bc1dbf18ada96ce1614c5ee985e3483a4b64c25b4ab86eebd6a08cd05b21a5538806fc99b0be40c4d9f330241b45db3de7dcf732cd16dfd429343eb
EBUILD perf-6.0.ebuild 7333 BLAKE2B 5f4b1fdaba45f08a1dc10713e59a590582099bd83f633e91a6ed705a3f6c07417d47723fcfb02b061c77dbcc0bc5cbe1e6f9d5602c5af18bf6c9fb227f1cf4a5 SHA512 6cd06a022eba4eec64a85235a01756d359eee818ac68d02622c0e1756b3f3c2602697a6dd0defc3c62ddb91301941044b39d05a96791d6c7051af273ddeaf35e
MISC metadata.xml 1495 BLAKE2B a85be66bde5edad744c83a0fd90bc9c93f87c96b804509ce21514915f02a4b32be0f2383105a25b2d076509b0bd902f9d630204f3bcb59e777426d88d50dfed7 SHA512 c672503c31391f0411de15996a22968a6a1301fd63675329649e8fe0304c32b2c008270a8d923650a60809026426439807e54ab41501497ac6a81e81adc23b44
diff --git a/dev-util/perf/files/perf-5.15-clang.patch b/dev-util/perf/files/perf-5.15-clang.patch
deleted file mode 100644
index 5ea0c75f27f1..000000000000
--- a/dev-util/perf/files/perf-5.15-clang.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From e1f1cbfe812e4a019034105ab5e81fd9f0742353 Mon Sep 17 00:00:00 2001
-From: Ian Rogers <irogers@google.com>
-Date: Mon, 11 Oct 2021 19:13:20 -0700
-Subject: [PATCH 1/3] tools: Bump minimum LLVM C++ std to GNU++14
-
-LLVM 9 (current release is LLVM 13) moved the minimum C++ version to
-GNU++14. Bump the version numbers in the feature test and perf build.
-
-Reviewed-by: Fangrui Song <maskray@google.com>
-Signed-off-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Daniel Borkmann <daniel@iogearbox.net>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Leo Yan <leo.yan@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Michael Petlan <mpetlan@redhat.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Nathan Chancellor <nathan@kernel.org>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Sedat Dilek <sedat.dilek@gmail.com>
-Cc: llvm@lists.linux.dev
-Link: https://lore.kernel.org/r/20211012021321.291635-1-irogers@google.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/build/feature/Makefile | 6 +++---
- tools/perf/Makefile.config | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
-index eff55d287db1..9756e589e4ae 100644
---- a/tools/build/feature/Makefile
-+++ b/tools/build/feature/Makefile
-@@ -296,7 +296,7 @@ $(OUTPUT)test-jvmti-cmlr.bin:
- $(BUILD)
-
- $(OUTPUT)test-llvm.bin:
-- $(BUILDXX) -std=gnu++11 \
-+ $(BUILDXX) -std=gnu++14 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -L$(shell $(LLVM_CONFIG) --libdir) \
- $(shell $(LLVM_CONFIG) --libs Core BPF) \
-@@ -304,12 +304,12 @@ $(OUTPUT)test-llvm.bin:
- > $(@:.bin=.make.output) 2>&1
-
- $(OUTPUT)test-llvm-version.bin:
-- $(BUILDXX) -std=gnu++11 \
-+ $(BUILDXX) -std=gnu++14 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- > $(@:.bin=.make.output) 2>&1
-
- $(OUTPUT)test-clang.bin:
-- $(BUILDXX) -std=gnu++11 \
-+ $(BUILDXX) -std=gnu++14 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -L$(shell $(LLVM_CONFIG) --libdir) \
- -Wl,--start-group -lclangBasic -lclangDriver \
-diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
-index 14e3e8d702a0..ddbe86defe39 100644
---- a/tools/perf/Makefile.config
-+++ b/tools/perf/Makefile.config
-@@ -285,7 +285,7 @@ CORE_CFLAGS += -Wall
- CORE_CFLAGS += -Wextra
- CORE_CFLAGS += -std=gnu99
-
--CXXFLAGS += -std=gnu++11 -fno-exceptions -fno-rtti
-+CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti
- CXXFLAGS += -Wall
- CXXFLAGS += -fno-omit-frame-pointer
- CXXFLAGS += -ggdb3
---
-2.33.1
-
-
-From 3e5c11995e04a9e3351330c34c4c802ce50df46c Mon Sep 17 00:00:00 2001
-From: Ian Rogers <irogers@google.com>
-Date: Mon, 11 Oct 2021 19:13:21 -0700
-Subject: [PATCH 2/3] perf clang: Fixes for more recent LLVM/clang
-
-The parameters to two functions and the location of a variable have
-changed in more recent LLVM/clang releases.
-
-Remove the unneecessary -fmessage-length and -ferror-limit flags, the
-former causes failures like:
-
- 58: builtin clang support :
- 58.1: builtin clang compile C source to IR :
- --- start ---
- test child forked, pid 279307
- error: unknown argument: '-fmessage-length'
- 1 error generated.
- test child finished with -1
-
-Tested with LLVM 6, 8, 9, 10 and 11.
-
-Reviewed-by: Fangrui Song <maskray@google.com>
-Signed-off-by: Ian Rogers <irogers@google.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Daniel Borkmann <daniel@iogearbox.net>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Leo Yan <leo.yan@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Michael Petlan <mpetlan@redhat.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Nathan Chancellor <nathan@kernel.org>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Sedat Dilek <sedat.dilek@gmail.com>,
-Cc: llvm@lists.linux.dev
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/perf/util/c++/clang.cpp | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp
-index c8885dfa3667..df7b18fb6b6e 100644
---- a/tools/perf/util/c++/clang.cpp
-+++ b/tools/perf/util/c++/clang.cpp
-@@ -43,8 +43,6 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path,
- "-cc1",
- "-triple", "bpf-pc-linux",
- "-fsyntax-only",
-- "-ferror-limit", "19",
-- "-fmessage-length", "127",
- "-O2",
- "-nostdsysteminc",
- "-nobuiltininc",
-@@ -55,7 +53,11 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path,
- "-x", "c"};
-
- CCArgs.append(CFlags.begin(), CFlags.end());
-- CompilerInvocation *CI = tooling::newInvocation(&Diags, CCArgs);
-+ CompilerInvocation *CI = tooling::newInvocation(&Diags, CCArgs
-+#if CLANG_VERSION_MAJOR >= 11
-+ ,/*BinaryName=*/nullptr
-+#endif
-+ );
-
- FrontendOptions& Opts = CI->getFrontendOpts();
- Opts.Inputs.clear();
-@@ -151,13 +153,16 @@ getBPFObjectFromModule(llvm::Module *Module)
-
- legacy::PassManager PM;
- bool NotAdded;
--#if CLANG_VERSION_MAJOR < 7
-- NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream,
-- TargetMachine::CGFT_ObjectFile);
-+ NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream
-+#if CLANG_VERSION_MAJOR >= 7
-+ , /*DwoOut=*/nullptr
-+#endif
-+#if CLANG_VERSION_MAJOR < 10
-+ , TargetMachine::CGFT_ObjectFile
- #else
-- NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream, nullptr,
-- TargetMachine::CGFT_ObjectFile);
-+ , llvm::CGFT_ObjectFile
- #endif
-+ );
- if (NotAdded) {
- llvm::errs() << "TargetMachine can't emit a file of this type\n";
- return std::unique_ptr<llvm::SmallVectorImpl<char>>(nullptr);
---
-2.33.1
-
-
-From aa2b4e5e920cbaadc0fed9b8aa7c4498feee3dd5 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Thu, 29 Apr 2021 13:44:48 +0200
-Subject: [PATCH 3/3] tools feature: update LLVM/Clang detection
-
-Since LLVM/Clang 10, individual libraries have been merged into
-monolithic libraries libLLVM.so, libclang.so, and libclang-cpp.so.
----
- tools/build/feature/Makefile | 8 +++-----
- tools/perf/Makefile.perf | 7 ++-----
- 2 files changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
-index 9756e589e4ae..23478bd06093 100644
---- a/tools/build/feature/Makefile
-+++ b/tools/build/feature/Makefile
-@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin:
- $(BUILDXX) -std=gnu++14 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -L$(shell $(LLVM_CONFIG) --libdir) \
-- $(shell $(LLVM_CONFIG) --libs Core BPF) \
-+ $(shell $(LLVM_CONFIG) --libs) \
- $(shell $(LLVM_CONFIG) --system-libs) \
- > $(@:.bin=.make.output) 2>&1
-
-@@ -312,11 +312,9 @@ $(OUTPUT)test-clang.bin:
- $(BUILDXX) -std=gnu++14 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -L$(shell $(LLVM_CONFIG) --libdir) \
-- -Wl,--start-group -lclangBasic -lclangDriver \
-- -lclangFrontend -lclangEdit -lclangLex \
-- -lclangAST -Wl,--end-group \
-- $(shell $(LLVM_CONFIG) --libs Core option) \
-+ $(shell $(LLVM_CONFIG) --libs) \
- $(shell $(LLVM_CONFIG) --system-libs) \
-+ -lclang-cpp \
- > $(@:.bin=.make.output) 2>&1
-
- -include $(OUTPUT)*.d
-diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
-index b856afa6eb52..d0ff0ddf9c18 100644
---- a/tools/perf/Makefile.perf
-+++ b/tools/perf/Makefile.perf
-@@ -410,14 +410,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
- LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
-
- ifeq ($(USE_CLANG), 1)
-- CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
-- CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
-- LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
-- LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
-+ LIBS += -lclang-cpp
- endif
-
- ifeq ($(USE_LLVM), 1)
-- LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs)
-+ LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs)
- LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM)
- endif
-
---
-2.33.1
-
diff --git a/dev-util/perf/files/perf-5.17.1-clang.patch b/dev-util/perf/files/perf-5.17.1-clang.patch
deleted file mode 100644
index 73d4506146c0..000000000000
--- a/dev-util/perf/files/perf-5.17.1-clang.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-
-Fix building against LLVM/Clang with monolithic libraries and
-adjust header includes for Clang >= 14.
-
---- a/tools/build/feature/Makefile
-+++ b/tools/build/feature/Makefile
-@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin:
- $(BUILDXX) -std=gnu++14 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -L$(shell $(LLVM_CONFIG) --libdir) \
-- $(shell $(LLVM_CONFIG) --libs Core BPF) \
-+ $(shell $(LLVM_CONFIG) --libs) \
- $(shell $(LLVM_CONFIG) --system-libs) \
- > $(@:.bin=.make.output) 2>&1
-
-@@ -312,10 +312,7 @@ $(OUTPUT)test-clang.bin:
- $(BUILDXX) -std=gnu++14 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -L$(shell $(LLVM_CONFIG) --libdir) \
-- -Wl,--start-group -lclangBasic -lclangDriver \
-- -lclangFrontend -lclangEdit -lclangLex \
-- -lclangAST -Wl,--end-group \
-- $(shell $(LLVM_CONFIG) --libs Core option) \
-+ -lclang-cpp $(shell $(LLVM_CONFIG) --libs) \
- $(shell $(LLVM_CONFIG) --system-libs) \
- > $(@:.bin=.make.output) 2>&1
-
---- a/tools/perf/Makefile.perf
-+++ b/tools/perf/Makefile.perf
-@@ -417,14 +417,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
- LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
-
- ifeq ($(USE_CLANG), 1)
-- CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
-- CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
-- LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
-- LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
-+ LIBS += -lclang-cpp
- endif
-
- ifeq ($(USE_LLVM), 1)
-- LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs)
-+ LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs)
- LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM)
- endif
-
---- a/tools/perf/util/c++/clang.cpp
-+++ b/tools/perf/util/c++/clang.cpp
-@@ -20,7 +20,11 @@
- #include "llvm/Option/Option.h"
- #include "llvm/Support/FileSystem.h"
- #include "llvm/Support/ManagedStatic.h"
-+#if CLANG_VERSION_MAJOR >= 14
-+#include "llvm/MC/TargetRegistry.h"
-+#else
- #include "llvm/Support/TargetRegistry.h"
-+#endif
- #include "llvm/Support/TargetSelect.h"
- #include "llvm/Target/TargetMachine.h"
- #include "llvm/Target/TargetOptions.h"
-
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
deleted file mode 100644
index 9f1e52387618..000000000000
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
- ${PYTHON_DEPS}
-"
-
-RDEPEND="audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace )
- crypt? ( virtual/libcrypt:= )
- clang? (
- <sys-devel/clang-14:=
- <sys-devel/llvm-14:=
- )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd )
- dev-libs/elfutils
- sys-libs/binutils-libs:="
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-QA_FLAGS_IGNORED=(
- usr/bin/perf-read-vdso32 # not linked with anything except for libc
- usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=13 llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- if use clang; then
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/${P}-clang.patch
- popd || die
- fi
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \
- "${S}"/Makefile.perf || die
- # A few places still use -Werror w/out $(WERROR) protection.
- sed -i -e 's@-Werror@@' \
- "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
- # Avoid the call to make kernelversion
- sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
- echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
-
- # The code likes to compile local assembly files which lack ELF markings.
- find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- emake V=1 VF=1 \
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- EXTRA_LDFLAGS="${LDFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE= \
- GTK2=$(usex gtk 1 "") \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=$(puse babeltrace) \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_LIBZSTD=$(puse zstd) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB=$(puse zlib) \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
diff --git a/dev-util/perf/perf-5.17.1.ebuild b/dev-util/perf/perf-5.17.1.ebuild
deleted file mode 100644
index 773d205044fc..000000000000
--- a/dev-util/perf/perf-5.17.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
- ${PYTHON_DEPS}
-"
-
-RDEPEND="audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace )
- crypt? ( virtual/libcrypt:= )
- clang? (
- sys-devel/clang:=
- sys-devel/llvm:=
- )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd )
- dev-libs/elfutils
- sys-libs/binutils-libs:="
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-QA_FLAGS_IGNORED=(
- 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
- 'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/${P}-clang.patch
- popd || die
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \
- "${S}"/Makefile.perf || die
- # A few places still use -Werror w/out $(WERROR) protection.
- sed -i -e 's@-Werror@@' \
- "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
- # Avoid the call to make kernelversion
- sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
- echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
-
- # The code likes to compile local assembly files which lack ELF markings.
- find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- emake V=1 VF=1 \
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- EXTRA_LDFLAGS="${LDFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE= \
- GTK2=$(usex gtk 1 "") \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=$(puse babeltrace) \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_LIBZSTD=$(puse zstd) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB=$(puse zlib) \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
diff --git a/dev-util/perf/perf-5.18.ebuild b/dev-util/perf/perf-5.18.ebuild
deleted file mode 100644
index 773d205044fc..000000000000
--- a/dev-util/perf/perf-5.18.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
- ${PYTHON_DEPS}
-"
-
-RDEPEND="audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace )
- crypt? ( virtual/libcrypt:= )
- clang? (
- sys-devel/clang:=
- sys-devel/llvm:=
- )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd )
- dev-libs/elfutils
- sys-libs/binutils-libs:="
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-QA_FLAGS_IGNORED=(
- 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
- 'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/${P}-clang.patch
- popd || die
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \
- "${S}"/Makefile.perf || die
- # A few places still use -Werror w/out $(WERROR) protection.
- sed -i -e 's@-Werror@@' \
- "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
- # Avoid the call to make kernelversion
- sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
- echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
-
- # The code likes to compile local assembly files which lack ELF markings.
- find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- emake V=1 VF=1 \
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- EXTRA_LDFLAGS="${LDFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE= \
- GTK2=$(usex gtk 1 "") \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=$(puse babeltrace) \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_LIBZSTD=$(puse zstd) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB=$(puse zlib) \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index dae347e98cf6..a1b75fd9e59e 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.ebuild
@@ -32,7 +32,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-10 21:44:43 +0000