gentoo auto-resync : 03:12:2022 - 14:59:58

5 files changed, 4 insertions, 164 deletions

diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 710174245478..e4169fe7c00c 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,10 +1,7 @@
-AUX libabigail-2.0-musl.patch 1911 BLAKE2B 58f9099cde19a18a44f2e1db208b74b8ee7371c2033da539b46af824d29067e13a543619013012d8fe8ca718cc7ee37fd06314608bcca53b2177d5d84cf54a86 SHA512 4591d3f838ac42e28ae28e059be0837c473edd41b44e942e5a7fbe324ed57afdf6244d4a93696b4498ab3c8d74fcb7175abbe951e4b2ef45ef59f985fa846ec3
-DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180
 DIST libabigail-2.1-docs.tar.xz 45532 BLAKE2B e59198a4ecdc6e0eef2b53ce62daa7a313e3dd3f28b71bc7184ec44745b165fab05bb08d22aa9a5e7f886c3b9156f0713737aa2899b579555b18daf8894e6a43 SHA512 078639bd08fdf190b8e71fe147495e0b6b14c7947e82d7aa5f5943ba00cf02763dc8c63a7d39189958a6cfb5175efff6a87cd74938fb3df8f7e123c5586605a6
 DIST libabigail-2.1.tar.gz 405861148 BLAKE2B 28c8c7cfc33b5002d10b94e2eb9e16ef403dcce73c1404b8af011d8bf71b142b62a5079154af078a479b4528f8464c420322b814e75bb3127a09992e7ca8f84f SHA512 4fe1d3323f078a76a7529c15a809d0c0d3ac43cabd5ab4bb5c2d03992cbbb61bae3ec858e40796bf9f65029cbc779d258ae4559455178fb95cb8b53bf92bcc9a
 DIST libabigail-2.2-docs.tar.xz 46776 BLAKE2B 469981ea9879b202bcfd68dfa1d71c25470c6c9b9a8058ff29923a4cb7ecd5cb652b239bf6faa05c6b7e479b425e2fd4327a0d6e1703f3622299d743b72e8b5c SHA512 c06bfa95957390ca7abd1e47a79e2da813fd3bdfb8dcaf23bf81da697c77b67d9cd5457010291e2753fcc74f55803a1c81234aa3b8cb27c6b1ce3991f6ab60ab
 DIST libabigail-2.2.tar.xz 351078692 BLAKE2B fc03b1653fbe94213713e710c358133a2abd51cac46c8d4b5d797715b16e3d9923ddd99f9a2f85352599b6b5628f52e505f0ec2bca6dc3ea118826bbe69ff42b SHA512 c512c4a497ea6bb88283feae6c31cf5fe347c260cf1670fe65296bf158d3a2aa449ca518a4f2780e814ffbe6970c7856d2ab91e15499638db78bc52d67d794ce
-EBUILD libabigail-2.0-r1.ebuild 1799 BLAKE2B 09bd488160175ed6215731a1ca5e5ae124c3154a79a7cbdffb38e694af3127bfddb218c5344b98802c160eed3e155cb3b30d6a51c798667861a1f5ac5ffaa5eb SHA512 d5bc22432ba3e4dfb7df1d964682df5e8952ce0afa014ef4764df8fbf7a1b9c942ec13c69b1da12b829a97f41644ffafb4729ea71245dd408d0cbebb3511a0a0
-EBUILD libabigail-2.1-r1.ebuild 2757 BLAKE2B f54ce5f405cefe8d307d35ce8aafec7a94775b27c33393fce3a330770eb4267fc7358baebe71bf2ee79f47024b9832b3858ac15bece3494f2f5a86e31efe7536 SHA512 7e35a61437d99c8238e6655c354e322758cbfd07e064aad867738a6f25a08aefec43e4dd2bc00d27e7ca17e983a37e5391dced49fc9c020be8fcd7a562e627b1
-EBUILD libabigail-2.2.ebuild 2736 BLAKE2B 8f57a8a891f67c36b0b6f942d81db8c21f6123824f874ef3cfdf2709e4458c84a10e229eb465f990eb78b947f7783d9f23f04ed5cf5fcc88a41c9fbababc655a SHA512 d3c414c1922450e2839c05dc1746bc23649d277f399fbf50e36fd4d8a876af9cc0e0ef6911db1d43da20ffed77f0d8b85c043544433b5ca97349ef80c06232a6
+EBUILD libabigail-2.1-r1.ebuild 2762 BLAKE2B 786535537ab8bdc0c6f760a20e26d20e0a86e895c2c70c98808b7f6283229e832ffb3a6f9f6c24009d3e9cdf5343b6397361a2d521bff5054ff14284ce5f3521 SHA512 7bd66ef1116e4a8462138c7485fb69d7f6d6178d7c01ebc979276237d0eda4404372ac95d75946ac215f45bc4a7731b72465e717d81543f13466cc51cbbd6be0
+EBUILD libabigail-2.2.ebuild 2741 BLAKE2B 0348937bba6bb48ea32a9677470b03d4864ddf3f5cda99dad2aa86e113be69d45da8efc4bab4dc52ba8c9960129cf965913ddec18e7fbec86ef8f5d666c49c68 SHA512 dc436791c61c22bb958adc55f3eb3f3ba51bd52c92bbe3fc6152bf7e1f7bd218932a00c79f5c3c1ccd03a5497574d5c2ab44b5db71582626da8f1af48b3793be
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/dev-util/libabigail/files/libabigail-2.0-musl.patch b/dev-util/libabigail/files/libabigail-2.0-musl.patch
deleted file mode 100644
index 6057c65622a6..000000000000
--- a/dev-util/libabigail/files/libabigail-2.0-musl.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -143,6 +143,7 @@
- dnl *************************************************
- 
- AC_PROG_CXX
-+AC_CANONICAL_HOST
- AC_USE_SYSTEM_EXTENSIONS
- AC_PROG_INSTALL
- 
-@@ -201,6 +202,12 @@
-       [CFLAGS="$CFLAGS -DBAD_FTS=1",
-        CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"])
- 
-+dnl On musl, we need to find fts-standalone
-+AS_CASE(
-+  [${host_os}], [*-musl*], [
-+    PKG_CHECK_MODULES([FTS], [fts-standalone])
-+])
-+
- dnl Check for dependency: libelf, libdw, libebl (elfutils)
- dnl Note that we need to use at least elfutils 0.159 but
- dnl at that time elfutils didnt have pkgconfig capabilities
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -41,12 +41,12 @@
- abg-symtab-reader.cc			\
- $(VIZ_SOURCES)
- 
--libabigail_la_LIBADD = $(DEPS_LIBS)
-+libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS)
- libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined
- 
- CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\"
- 
- AM_CPPFLAGS=\
--$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \
-+$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \
- -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \
- -I$(abs_top_builddir)/include -I$(abs_top_builddir)
---- a/tools/abisym.cc
-+++ b/tools/abisym.cc
-@@ -11,6 +11,7 @@
- /// in its symbol tables and report what it sees.
- 
- #include <elf.h>
-+#include <libgen.h>
- #include <cstring>
- #include <iostream>
- #include <sstream>
---- a/tools/kmidiff.cc
-+++ b/tools/kmidiff.cc
-@@ -11,7 +11,6 @@
- 
- #include <sys/types.h>
- #include <dirent.h>
--#include <fts.h>
- #include <cstring>
- #include <string>
- #include <vector>
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -37,7 +37,8 @@
- 
- abipkgdiff_SOURCES = abipkgdiff.cc
- abipkgdiffdir = $(bindir)
--abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la
-+abipkgdiff_CPPFLAGS = $(FTS_CFLAGS)
-+abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la $(FTS_LIBS)
- abipkgdiff_LDFLAGS = -pthread
- 
- kmidiff_SOURCES = kmidiff.cc
diff --git a/dev-util/libabigail/libabigail-2.0-r1.ebuild b/dev-util/libabigail/libabigail-2.0-r1.ebuild
deleted file mode 100644
index 96de89727269..000000000000
--- a/dev-util/libabigail/libabigail-2.0-r1.ebuild
+++ /dev/null
@@ -1,85 +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 autotools bash-completion-r1 python-any-r1 out-of-source
-
-DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
-HOMEPAGE="https://sourceware.org/libabigail/"
-SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/libxml2:2
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	test? ( ${PYTHON_DEPS} )"
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-src_prepare() {
-	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
-}
-
-my_src_configure() {
-	econf \
-		--disable-deb \
-		--disable-fedabipkgdiff \
-		--disable-rpm \
-		--disable-rpm415 \
-		--disable-static \
-		--enable-bash-completion \
-		--enable-python3 \
-		$(use_enable doc apidoc) \
-		$(use_enable doc manual)
-}
-
-my_src_compile() {
-	default
-	use doc && emake doc
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		doman doc/manuals/man/*
-		doinfo doc/manuals/texinfo/abigail.info
-
-		dodoc -r doc/manuals/html
-
-		docinto html/api
-		dodoc -r doc/api/html/.
-	fi
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	local file
-	for file in abicompat abidiff abidw abilint abinilint abipkgdiff abisym fedabipkgdiff ; do
-		dobashcomp bash-completion/${file}
-	done
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/libabigail/libabigail-2.1-r1.ebuild b/dev-util/libabigail/libabigail-2.1-r1.ebuild
index fb2e698ad110..dec332c4e027 100644
--- a/dev-util/libabigail/libabigail-2.1-r1.ebuild
+++ b/dev-util/libabigail/libabigail-2.1-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		app-doc/doxygen
+		app-doc/doxygen[dot]
 		dev-python/sphinx
 		sys-apps/texinfo
 	)
diff --git a/dev-util/libabigail/libabigail-2.2.ebuild b/dev-util/libabigail/libabigail-2.2.ebuild
index cfaccef7ea23..e57b7f1c2158 100644
--- a/dev-util/libabigail/libabigail-2.2.ebuild
+++ b/dev-util/libabigail/libabigail-2.2.ebuild
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		app-doc/doxygen
+		app-doc/doxygen[dot]
 		dev-python/sphinx
 		sys-apps/texinfo
 	)