commit: a6d182b2b4a4707c5041fe71d998a231cb95266f Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Mon Mar 6 19:57:12 2023 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Mon Mar 6 19:57:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6d182b2
dev-util/annobin: treeclean Closes: https://bugs.gentoo.org/869227 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> dev-util/annobin/Manifest | 2 - dev-util/annobin/annobin-10.73.ebuild | 87 ---------------------- dev-util/annobin/annobin-10.76.ebuild | 87 ---------------------- .../files/annobin-10.58-demangle.h-path.patch | 12 --- .../annobin/files/annobin-10.65-fix-bashism.patch | 28 ------- dev-util/annobin/metadata.xml | 18 ----- profiles/package.mask | 4 - 7 files changed, 238 deletions(-) diff --git a/dev-util/annobin/Manifest b/dev-util/annobin/Manifest deleted file mode 100644 index a695ec3cf..000000000 --- a/dev-util/annobin/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST annobin-10.73.tar.xz 846840 BLAKE2B cb905febf5ddeb811a4a41c5ef88f1e2f627c80a68fe2e7d6640b8aaa1cadb56907f3d162902ca260af4f9c335cf94b3267f17193dba83c38564a54cb4419a39 SHA512 264bd43279526095b4bc11accc0c6a9e8a6fdaa9adf9b8a12076b0d55f34ecc7df0c4653ec48210aff7cefabac208fcab52922babb9e404f22db809976a6a3e8 -DIST annobin-10.76.tar.xz 848204 BLAKE2B efc7f655001f93ba5bcfc4e4ee6d05752b1f7b6daa719aa20bf5304955b097787a2b73aee3938e9d411308f3422774350c1d994b388b476cd141246b9bb9abf3 SHA512 53b7d16c1b4c7d480ead2ec844a1895c39c441bdf60ed4b00205247a12ea190bfaa14591f8da629587c86d6ab2932571fed4ab9c9b8aa86fa29dda6ba43a2e06 diff --git a/dev-util/annobin/annobin-10.73.ebuild b/dev-util/annobin/annobin-10.73.ebuild deleted file mode 100644 index 0cdca4110..000000000 --- a/dev-util/annobin/annobin-10.73.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 2018-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=14 - -inherit autotools llvm toolchain-funcs - -DESCRIPTION="Binary annotation compiler plugin and tools" -HOMEPAGE="https://nickc.fedorapeople.org"; -SRC_URI="https://nickc.fedorapeople.org/${P}.tar.xz"; - -KEYWORDS="~amd64" -LICENSE="GPL-3" -SLOT="0" -IUSE="clang doc llvm test" - -RDEPEND=" - app-arch/rpm - dev-libs/elfutils - sys-libs/binutils-libs - - clang? ( <sys-devel/clang-${LLVM_MAX_SLOT}:= ) - !clang? ( llvm? ( <sys-devel/llvm-${LLVM_MAX_SLOT}:= ) ) - llvm? ( - || ( - sys-devel/llvm:13 - sys-devel/llvm:${LLVM_MAX_SLOT} - ) - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-10.65-fix-bashism.patch" - "${FILESDIR}/${PN}-10.58-demangle.h-path.patch" -) -REQUIRED_USE=" - clang? ( llvm ) -" -RESTRICT="!test? ( test )" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if ! tc-is-gcc ; then - eerror "${PN} is a gcc plugin. Please emerge using gcc as CC" - die "use gcc" - fi - fi -} - -src_prepare() { - default - sed -i 's|2.69|2.71|g' config/override.m4 || die - - if use llvm; then - local llvmdir="$(get_llvm_prefix -d)" || die - local llvm_plugindir - llvm_plugindir="$( - clang --print-search-dirs | gawk -e\ - 'BEGIN { FS = ":" } /libraries/ { print gensub(" =","",1,$2) } END { }' - )" || die - einfo $llvm_plugindir - - sed -i "/^INCDIR.*/ s|$| -I${llvmdir}/include|" {llvm,clang}-plugin/Makefile.in || die - sed -i "/^CLANG_LIBS.*/ s|$| -L${llvmdir}/$(get_libdir)|" clang-plugin/Makefile.in || die - sed -i "s|^PLUGIN_INSTALL_DIR =.*|PLUGIN_INSTALL_DIR = \$\{DESTDIR\}/$(realpath ${llvm_plugindir})|" {llvm,clang}-plugin/Makefile.in || die - fi - - eautoreconf -} - -src_configure() { - local plugdir="$($(tc-getCC) -print-file-name=plugin)" || die - local myconf=( - --with-gcc-plugin-dir="${plugdir}" - --with-libelf - --without-debuginfod # we don't have it enabled, comes with elfutils - $(use_with clang) - $(use_with doc docs) - $(use_with llvm) - $(use_with test tests) - ) - - econf "${myconf[@]}" -} diff --git a/dev-util/annobin/annobin-10.76.ebuild b/dev-util/annobin/annobin-10.76.ebuild deleted file mode 100644 index 0cdca4110..000000000 --- a/dev-util/annobin/annobin-10.76.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 2018-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=14 - -inherit autotools llvm toolchain-funcs - -DESCRIPTION="Binary annotation compiler plugin and tools" -HOMEPAGE="https://nickc.fedorapeople.org"; -SRC_URI="https://nickc.fedorapeople.org/${P}.tar.xz"; - -KEYWORDS="~amd64" -LICENSE="GPL-3" -SLOT="0" -IUSE="clang doc llvm test" - -RDEPEND=" - app-arch/rpm - dev-libs/elfutils - sys-libs/binutils-libs - - clang? ( <sys-devel/clang-${LLVM_MAX_SLOT}:= ) - !clang? ( llvm? ( <sys-devel/llvm-${LLVM_MAX_SLOT}:= ) ) - llvm? ( - || ( - sys-devel/llvm:13 - sys-devel/llvm:${LLVM_MAX_SLOT} - ) - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-10.65-fix-bashism.patch" - "${FILESDIR}/${PN}-10.58-demangle.h-path.patch" -) -REQUIRED_USE=" - clang? ( llvm ) -" -RESTRICT="!test? ( test )" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if ! tc-is-gcc ; then - eerror "${PN} is a gcc plugin. Please emerge using gcc as CC" - die "use gcc" - fi - fi -} - -src_prepare() { - default - sed -i 's|2.69|2.71|g' config/override.m4 || die - - if use llvm; then - local llvmdir="$(get_llvm_prefix -d)" || die - local llvm_plugindir - llvm_plugindir="$( - clang --print-search-dirs | gawk -e\ - 'BEGIN { FS = ":" } /libraries/ { print gensub(" =","",1,$2) } END { }' - )" || die - einfo $llvm_plugindir - - sed -i "/^INCDIR.*/ s|$| -I${llvmdir}/include|" {llvm,clang}-plugin/Makefile.in || die - sed -i "/^CLANG_LIBS.*/ s|$| -L${llvmdir}/$(get_libdir)|" clang-plugin/Makefile.in || die - sed -i "s|^PLUGIN_INSTALL_DIR =.*|PLUGIN_INSTALL_DIR = \$\{DESTDIR\}/$(realpath ${llvm_plugindir})|" {llvm,clang}-plugin/Makefile.in || die - fi - - eautoreconf -} - -src_configure() { - local plugdir="$($(tc-getCC) -print-file-name=plugin)" || die - local myconf=( - --with-gcc-plugin-dir="${plugdir}" - --with-libelf - --without-debuginfod # we don't have it enabled, comes with elfutils - $(use_with clang) - $(use_with doc docs) - $(use_with llvm) - $(use_with test tests) - ) - - econf "${myconf[@]}" -} diff --git a/dev-util/annobin/files/annobin-10.58-demangle.h-path.patch b/dev-util/annobin/files/annobin-10.58-demangle.h-path.patch deleted file mode 100644 index 989a5e0f4..000000000 --- a/dev-util/annobin/files/annobin-10.58-demangle.h-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff '--color=auto' -ru /var/tmp/portage/dev-util/annobin-10.58/work/annobin-10.58/annocheck/annocheck.h annobin-10.58/annocheck/annocheck.h ---- /var/tmp/portage/dev-util/annobin-10.58/work/annobin-10.58/annocheck/annocheck.h 2022-03-14 12:43:07.000000000 +0100 -+++ annobin-10.58/annocheck/annocheck.h 2022-03-20 08:36:28.373389297 +0100 -@@ -38,7 +38,7 @@ - #include <elfutils/libdw.h> - - #include <libiberty.h> --#include <demangle.h> -+#include <libiberty/demangle.h> - - #define PACKAGE "annocheck" - diff --git a/dev-util/annobin/files/annobin-10.65-fix-bashism.patch b/dev-util/annobin/files/annobin-10.65-fix-bashism.patch deleted file mode 100644 index eab710f7b..000000000 --- a/dev-util/annobin/files/annobin-10.65-fix-bashism.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/config/debuginfod.m4 -+++ b/config/debuginfod.m4 -@@ -34,5 +34,5 @@ - fi - fi - AM_CONDITIONAL([HAVE_DEBUGINFOD], -- [test x"$have_debuginfod_lib" == xyes -a x"$have_debuginfod_h" == xyes]) -+ [test x"$have_debuginfod_lib" = xyes && x"$have_debuginfod_h" = xyes]) - ]) ---- a/configure.ac -+++ b/configure.ac -@@ -149,13 +149,13 @@ - AM_CONDITIONAL([COND_DOCS], [test "$with_docs" != no]) - AM_CONDITIONAL([COND_TESTS], [test "$with_tests" != no]) - AM_CONDITIONAL([COND_ANNOCHECK], [test "$with_annocheck" != no]) --AM_CONDITIONAL([COND_CLANG], [test "$with_clang_plugin" == yes]) -+AM_CONDITIONAL([COND_CLANG], [test "$with_clang_plugin" = yes]) - AM_CONDITIONAL([COND_GCC_PLUGIN], [test "$with_gcc_plugin" != no]) --AM_CONDITIONAL([COND_LLVM], [test "$with_llvm_plugin" == yes]) -+AM_CONDITIONAL([COND_LLVM], [test "$with_llvm_plugin" = yes]) - - AC_CONFIG_FILES(Makefile) - --if test "$with_annocheck" != no -o "$with_gcc_plugin" != no; then -+if test "$with_annocheck" != no || "$with_gcc_plugin" != no; then - AC_CONFIG_HEADERS(gcc-plugin/config.h) - fi - if test "$with_docs" != no; then diff --git a/dev-util/annobin/metadata.xml b/dev-util/annobin/metadata.xml deleted file mode 100644 index b92f52181..000000000 --- a/dev-util/annobin/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <description>co-maintainers welcome</description> - <email>lssndrbarbi...@gmail.com</email> - <name>Alessandro Barbieri</name> - </maintainer> - <longdescription lang="en"> - A plugin for GCC that records extra information in the files that it compiles. - This information can be used to analyze the files, and provide the loader - with extra information about the requirements of the loaded file. - </longdescription> - <use> - <flag name="clang">Build the clang plugin</flag> - <flag name="llvm">Build the LLVM plugin</flag> - </use> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 10f76dc5f..a438fc95a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -57,10 +57,6 @@ dev-python/zVMCloudConnector acct-user/gogs www-apps/gogs -# Anna Vyalkova <cyber+gen...@sysrq.in> (2023-02-02) -# Requires <sys-devel/llvm-14, which is no longer available in ::gentoo. -dev-util/annobin - # Viorel Munteanu <cea...@gentoo.org> (2023-01-29) # Very outdated live version # See also this discussion: https://github.com/gentoo/guru/commit/10a1f43a0ebe867718744de54cb17fde32e4c329
