5 files changed, 142 insertions, 11 deletions
diff --git a/dev-util/annobin/Manifest b/dev-util/annobin/Manifest
index cc64ada053b9..b4eaef8a5d7c 100644
--- a/dev-util/annobin/Manifest
+++ b/dev-util/annobin/Manifest
@@ -1,2 +1,2 @@
-DIST annobin-10.65.tar.xz 849952 BLAKE2B 6f6124f6470d3f6fe37ce766dc65af43b3020d0ea745cbaf501c3757a83c500f590276cde98048bd5c47602b8ca954d43039060779cec3d8d2abdd5f1695fac8 SHA512 c7191fc88072431f3c62ae2abe405b88c78b3d703353810aef6bb6bf0c3fa16ad2db84d5e5e940864518474119393454aadc40fdca84bdbba18d686face59ce1
 DIST annobin-10.67.tar.xz 850052 BLAKE2B d21e85243f729f352fb45e7bb9876507db7cee89bc345cf1b1ff09116d83080aab41a01a787a502bf110c09dc413307463ee58c5ea89bf5c6d976b15289f3c23 SHA512 dde856e327aeef376ab2dc67178fbd8e6a055904c8a24da5bc5d69fc52587bb0673c276ffe68ce6cd424c65d3a1653b8ae1e32a90504378fc9291f039160b413
+DIST annobin-10.68.tar.xz 846704 BLAKE2B 6a997f123d3b9c84141858c3ce3ad215f6e44bcb1348bd19e750006072e4509b4c30ce3e6ef2739ddf95baa4adca5b7200f7054a84a20f635cda2f424e765c09 SHA512 0e3a12e173f6f77443c81e44f6be565b8392e6fcba002c8482f3edd13c56620acd5f528a00f10a9f81b9c8aeedf008103850458b2829cecbd89be98649879acc
diff --git a/dev-util/annobin/annobin-10.65.ebuild b/dev-util/annobin/annobin-10.68.ebuild
index 11bea8f4e7c1..763da0ecdc7d 100644
--- a/dev-util/annobin/annobin-10.65.ebuild
+++ b/dev-util/annobin/annobin-10.68.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	!clang? ( llvm? ( <sys-devel/llvm-${LLVM_MAX_SLOT}:= ) )
 	llvm? (
 		|| (
-			sys-devel/llvm:11
 			sys-devel/llvm:12
 			sys-devel/llvm:13
 			sys-devel/llvm:${LLVM_MAX_SLOT}
@@ -35,7 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-fix-bashism.patch"
+	"${FILESDIR}/${PN}-10.65-fix-bashism.patch"
 	"${FILESDIR}/${PN}-10.58-demangle.h-path.patch"
 )
 REQUIRED_USE="
diff --git a/dev-util/babeltrace/babeltrace-1.5.8.ebuild b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
index 73c74b6ae152..35e3b9f18b6a 100644
--- a/dev-util/babeltrace/babeltrace-1.5.8.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="A command-line tool and library to read and convert trace files"
 HOMEPAGE="https://babeltrace.org/"
@@ -17,12 +19,23 @@ RDEPEND="dev-libs/glib:2
 	dev-libs/popt
 	dev-libs/elfutils
 	sys-apps/util-linux
-	"
+"
 
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
-	"
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_enable test glibtest) \
 		--enable-debug-info
diff --git a/dev-util/babeltrace/files/babeltrace-1.5.8-slibtool.patch b/dev-util/babeltrace/files/babeltrace-1.5.8-slibtool.patch
new file mode 100644
index 000000000000..39572985b94e
--- /dev/null
+++ b/dev-util/babeltrace/files/babeltrace-1.5.8-slibtool.patch
@@ -0,0 +1,119 @@
+From 2780bd0b908b4021bcd2a12a56094deb7861c3fc Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 7 May 2022 20:31:24 -0700
+Subject: [PATCH] Fix the build with slibtool
+
+gentoo bug: https://bugs.gentoo.org/777444
+---
+ formats/ctf-text/Makefile.am       | 4 +---
+ formats/ctf-text/types/Makefile.am | 3 +--
+ formats/ctf/Makefile.am            | 1 -
+ formats/ctf/ir/Makefile.am         | 3 +--
+ formats/ctf/metadata/Makefile.am   | 2 +-
+ formats/ctf/types/Makefile.am      | 3 +--
+ formats/ctf/writer/Makefile.am     | 3 +--
+ lib/Makefile.am                    | 4 +---
+ 8 files changed, 7 insertions(+), 16 deletions(-)
+
+diff --git a/formats/ctf-text/Makefile.am b/formats/ctf-text/Makefile.am
+index d773c8157..f2f6b22e3 100644
+--- a/formats/ctf-text/Makefile.am
++++ b/formats/ctf-text/Makefile.am
+@@ -12,9 +12,7 @@ libbabeltrace_ctf_text_la_LDFLAGS = \
+ 	$(LD_NO_AS_NEEDED) -version-info $(BABELTRACE_LIBRARY_VERSION) \
+ 	types/libctf-text-types.la
+ 
+-libbabeltrace_ctf_text_la_LIBADD = \
+-	$(top_builddir)/lib/libbabeltrace.la \
+-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
++libbabeltrace_ctf_text_la_LIBADD =
+ 
+ if ENABLE_DEBUG_INFO
+ libbabeltrace_ctf_text_la_LIBADD += $(top_builddir)/lib/libdebug-info.la
+diff --git a/formats/ctf-text/types/Makefile.am b/formats/ctf-text/types/Makefile.am
+index 576d29d7d..596a6a859 100644
+--- a/formats/ctf-text/types/Makefile.am
++++ b/formats/ctf-text/types/Makefile.am
+@@ -14,5 +14,4 @@ libctf_text_types_la_SOURCES = \
+ 
+ libctf_text_types_la_LDFLAGS = $(LT_NO_UNDEFINED)
+ 
+-libctf_text_types_la_LIBADD = \
+-	$(top_builddir)/lib/libbabeltrace.la
++libctf_text_types_la_LIBADD =
+diff --git a/formats/ctf/Makefile.am b/formats/ctf/Makefile.am
+index 23ae0b93c..65de7cf87 100644
+--- a/formats/ctf/Makefile.am
++++ b/formats/ctf/Makefile.am
+@@ -17,7 +17,6 @@ libbabeltrace_ctf_la_LDFLAGS = \
+ 	$(LD_NO_AS_NEEDED) -version-info $(BABELTRACE_LIBRARY_VERSION)
+ 
+ libbabeltrace_ctf_la_LIBADD = \
+-	$(top_builddir)/lib/libbabeltrace.la \
+ 	types/libctf-types.la \
+ 	metadata/libctf-parser.la \
+ 	metadata/libctf-ast.la \
+diff --git a/formats/ctf/ir/Makefile.am b/formats/ctf/ir/Makefile.am
+index 6f5b06e4d..3af40cfc1 100644
+--- a/formats/ctf/ir/Makefile.am
++++ b/formats/ctf/ir/Makefile.am
+@@ -22,8 +22,7 @@ libctf_ir_la_SOURCES = \
+ 
+ libctf_ir_la_LDFLAGS = $(LT_NO_UNDEFINED)
+ 
+-libctf_ir_la_LIBADD = \
+-	$(top_builddir)/lib/libbabeltrace.la
++libctf_ir_la_LIBADD =
+ 
+ if BABELTRACE_BUILD_WITH_LIBUUID
+ libctf_ir_la_LIBADD += -luuid
+diff --git a/formats/ctf/metadata/Makefile.am b/formats/ctf/metadata/Makefile.am
+index 573f94d31..a181e784c 100644
+--- a/formats/ctf/metadata/Makefile.am
++++ b/formats/ctf/metadata/Makefile.am
+@@ -24,7 +24,7 @@ libctf_ast_la_SOURCES = ctf-visitor-xml.c \
+ 		ctf-visitor-semantic-validator.c \
+ 		ctf-visitor-generate-io-struct.c
+ libctf_ast_la_LIBADD = \
+-	$(top_builddir)/lib/libbabeltrace.la
++	$(top_builddir)/types/libbabeltrace_types.la
+ libctf_ast_la_LDFLAGS = $(LT_NO_UNDEFINED)
+ 
+ if BABELTRACE_BUILD_WITH_LIBUUID
+diff --git a/formats/ctf/types/Makefile.am b/formats/ctf/types/Makefile.am
+index a1bcfb2fe..9ae105868 100644
+--- a/formats/ctf/types/Makefile.am
++++ b/formats/ctf/types/Makefile.am
+@@ -14,5 +14,4 @@ libctf_types_la_SOURCES = \
+ 
+ libctf_types_la_LDFLAGS = $(LT_NO_UNDEFINED)
+ 
+-libctf_types_la_LIBADD = \
+-	$(top_builddir)/lib/libbabeltrace.la
++libctf_types_la_LIBADD =
+diff --git a/formats/ctf/writer/Makefile.am b/formats/ctf/writer/Makefile.am
+index e328084be..ab27b0742 100644
+--- a/formats/ctf/writer/Makefile.am
++++ b/formats/ctf/writer/Makefile.am
+@@ -6,8 +6,7 @@ libctf_writer_la_SOURCES = \
+ 	writer.c \
+ 	functor.c
+ 
+-libctf_writer_la_LIBADD = \
+-	$(top_builddir)/lib/libbabeltrace.la
++libctf_writer_la_LIBADD =
+ 
+ libctf_writer_la_LDFLAGS = $(LT_NO_UNDEFINED)
+ 
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 48620e8fd..e4748cadc 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -28,6 +28,4 @@ libdebug_info_la_LIBADD = libbabeltrace.la
+ endif
+ 
+ libbabeltrace_la_LIBADD = \
+-	prio_heap/libprio_heap.la \
+-	$(top_builddir)/types/libbabeltrace_types.la \
+-	$(top_builddir)/compat/libcompat.la
++	prio_heap/libprio_heap.la
diff --git a/dev-util/maxcso/maxcso-9999.ebuild b/dev-util/maxcso/maxcso-9999.ebuild
index a9f29908ada6..d96731620d13 100644
--- a/dev-util/maxcso/maxcso-9999.ebuild
+++ b/dev-util/maxcso/maxcso-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,16 +18,16 @@ fi
 LICENSE="ISC MIT LGPL-2.1+ Apache-2.0"
 SLOT="0"
 
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
+DEPEND="
 	app-arch/lz4
 	dev-libs/libuv
 	sys-libs/zlib
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
 }
 
 src_install() {