gentoo auto-resync : 16:02:2023 - 20:05:28

10 files changed, 4 insertions, 473 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 57243b227f7a..7bf7690d9eb2 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 64cc81a72576..f3c098573e92 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,9 +1,3 @@
-AUX hamlib-4.4-fix-clang-warnings.patch 6673 BLAKE2B 26b0bbbc2c9bb89fe2707b0bbc7ff81c33104670f5bc157fe7063b5150786963fcd379fca620c7a457682f6b1d8bc9a13729ab442ce771500763cf91127a68db SHA512 1cfbff642826281d42226a5c4364b438602dc2022baf7b6bd7cc41d4cb1a0defec511a9c20d06cdf5aca6549e00ec11639899326ac03d4a6604a7440d813f7e9
-AUX hamlib-4.4-slibtool.patch 2414 BLAKE2B 798b95d72e57d1b68a1d26c36f631b084722a32ae3c20238f7cb2495412e200ee7e909d2e614ad27db7016654a6e662834b8c95f86dbec609754fe817a49a1b8 SHA512 743a5be7160e80453810873ea074fd62934524fcf7fc9b8e224c93a2876760c96793ebb13e6e40c32b648065b034a2355935862d540c6620babaeacb7fc2f88c
-DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
-DIST hamlib-4.5.3.tar.gz 2590200 BLAKE2B 7c06a20a1185a2e413fee56231f3e0f6aa77a7585b9853896b00abb773e2e23fc5e97a8a3fbb873528282756ee674b1ca5b2b14f0fe8e6b9b8e8f7e8ffa223f2 SHA512 be3b58c7276c1289d85b4dc9054016757200fde06d66116f7a1687442e53bf322f0a3ae974c9b784cbd0bff0c64b901b97fac74184f4b4a0fdf1f5079d0ea509
 DIST hamlib-4.5.4.tar.gz 2598483 BLAKE2B 7f9654d6aa8c241e58dfdcd4d1967cb0d2415f9cd7a06de68f0ec0e837442db4fd373cfcd08406afca6d6c6c71435358bc5d31969fb0569dea5853b4f3d4f38e SHA512 882fb517a3e5854cdaad506520e96c7736214fe27d1ac053f0510e3c5c08e1bf40217442f519d1c4be92e3d05135c7bd90bc0d60f334f52994e69b2ce9d3f442
-EBUILD hamlib-4.4.ebuild 2256 BLAKE2B 4fc3f7416dc3da43c2399b22e7d54944f65f5ab40457337a52f68a68db8d0e3d093a646faee5da6148d53ac8d954766eaaf0367d8466f0aeba45049c849538ab SHA512 283a053b38550700d6025156ca788e5bf500a1353f6d1dcbe5f164d3241cb35d0bf92cb4727c536b7f7a035738739c60cabc5119f2790d130ad0a8f54edd25b7
-EBUILD hamlib-4.5.3.ebuild 2147 BLAKE2B 047c6464904109604d18caa6896d404858b9e55da43accbc2840453466b20cc09b24de875f879e0fd0c859f53c4255e341788e5b860b3a12d25a943f68efbde7 SHA512 587439d878cedeb67c0365e580131ea83061da702c08589c60f9eba015ed468033cd3edb5e0b8fdc4d6b4ccfb64425f0d20cfc5ee718c1d0ae47f7e00bd99040
 EBUILD hamlib-4.5.4.ebuild 2145 BLAKE2B 5d5d3932673d5a10d002fe1c6d8b1af5aac6417eb0b71742b4e25b4685d4559150a3f628fdc6f0fa38e77dd077be523fd935a6085855cc5a8586b2dbe9ff2fd5 SHA512 6056f08cb4156e5465642f7397d1eede36ac0f8343581b5f98f598a74b0c0b4fb2b8c1ad736397425584a061015936744000d74f44b3f9859239e3f6d73ef3c4
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch b/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
deleted file mode 100644
index 832af50e0e6c..000000000000
--- a/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 1aebee2da9d29ff1d1a16e19f23bbff4e0f319a8 Mon Sep 17 00:00:00 2001
-From: Mike Black W9MDB <mdblack98@yahoo.com>
-Date: Mon, 14 Nov 2022 16:37:20 -0600
-Subject: [PATCH 1/2] Fix clang warning on callback functions
- https://github.com/Hamlib/Hamlib/issues/1149
-
----
- include/hamlib/rig.h |  4 +++-
- rigs/aor/aor.c       |  4 ++--
- src/mem.c            | 15 ++++++++-------
- tests/testcaps.sh    | 12 ++++++++++++
- 4 files changed, 25 insertions(+), 10 deletions(-)
- create mode 100755 tests/testcaps.sh
-
-diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
-index 574c21bd..5dbb5a7b 100644
---- a/include/hamlib/rig.h
-+++ b/include/hamlib/rig.h
-@@ -1675,7 +1675,7 @@ typedef struct cal_table_float cal_table_float_t;
- //! @cond Doxygen_Suppress
- #define EMPTY_FLOAT_CAL { 0, { { 0, 0f }, } }
- 
--typedef int (* chan_cb_t)(RIG *, channel_t **, int, const chan_t *, rig_ptr_t);
-+typedef int (* chan_cb_t)(RIG *, vfo_t vfo, channel_t **, int, const chan_t *, rig_ptr_t);
- typedef int (* confval_cb_t)(RIG *,
-                              const struct confparams *,
-                              value_t *,
-@@ -2024,10 +2024,12 @@ struct rig_caps {
-     int (*get_chan_all_cb)(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t);
- 
-     int (*set_mem_all_cb)(RIG *rig,
-+                          vfo_t vfo,
-                           chan_cb_t chan_cb,
-                           confval_cb_t parm_cb,
-                           rig_ptr_t);
-     int (*get_mem_all_cb)(RIG *rig,
-+                          vfo_t vfo,
-                           chan_cb_t chan_cb,
-                           confval_cb_t parm_cb,
-                           rig_ptr_t);
-diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
-index ad4331d9..3f69d723 100644
---- a/rigs/aor/aor.c
-+++ b/rigs/aor/aor.c
-@@ -1364,7 +1364,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t arg)
-      * future data for channel channel_num
-      */
-     chan = NULL;
--    retval = chan_cb(rig, &chan, chan_next, chan_list, arg);
-+    retval = chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
- 
-     if (retval != RIG_OK)
-     {
-@@ -1414,7 +1414,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t arg)
-              * provide application with channel data,
-              * and ask for a new channel structure
-              */
--            chan_cb(rig, &chan, chan_next, chan_list, arg);
-+            chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
- 
-             if (j >= LINES_PER_MA - 1)
-             {
-diff --git a/src/mem.c b/src/mem.c
-index 8aa51e57..a6d72e59 100644
---- a/src/mem.c
-+++ b/src/mem.c
-@@ -954,7 +954,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb,
-          * future data for channel channel_num
-          */
-         chan = NULL;
--        retval = chan_cb(rig, &chan, chan_list[i].startc, chan_list, arg);
-+        retval = chan_cb(rig, vfo, &chan, chan_list[i].startc, chan_list, arg);
- 
-         if (retval != RIG_OK)
-         {
-@@ -995,7 +995,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb,
- 
-             chan_next = j < chan_list[i].endc ? j + 1 : j;
- 
--            chan_cb(rig, &chan, chan_next, chan_list, arg);
-+            chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
-         }
-     }
- 
-@@ -1016,7 +1016,7 @@ int set_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb,
-         for (j = chan_list[i].startc; j <= chan_list[i].endc; j++)
-         {
- 
--            chan_cb(rig, &chan, j, chan_list, arg);
-+            chan_cb(rig, vfo, &chan, j, chan_list, arg);
-             chan->vfo = RIG_VFO_MEM;
- 
-             retval = rig_set_channel(rig, vfo, chan);
-@@ -1044,6 +1044,7 @@ struct map_all_s
-  * chan_cb_t to be used for non cb get/set_all
-  */
- static int map_chan(RIG *rig,
-+                    vfo_t vfo,
-                     channel_t **chan,
-                     int channel_num,
-                     const chan_t *chan_list,
-@@ -1343,7 +1344,7 @@ int HAMLIB_API rig_set_mem_all_cb(RIG *rig,
- 
-     if (rc->set_mem_all_cb)
-     {
--        return rc->set_mem_all_cb(rig, chan_cb, parm_cb, arg);
-+        return rc->set_mem_all_cb(rig, vfo, chan_cb, parm_cb, arg);
-     }
- 
- 
-@@ -1411,7 +1412,7 @@ int HAMLIB_API rig_get_mem_all_cb(RIG *rig,
- 
-     if (rc->get_mem_all_cb)
-     {
--        return rc->get_mem_all_cb(rig, chan_cb, parm_cb, arg);
-+        return rc->get_mem_all_cb(rig, vfo, chan_cb, parm_cb, arg);
-     }
- 
-     /* if not available, emulate it */
-@@ -1480,7 +1481,7 @@ int HAMLIB_API rig_set_mem_all(RIG *rig,
-     mem_all_arg.vals = (value_t *) vals;
- 
-     if (rc->set_mem_all_cb)
--        return rc->set_mem_all_cb(rig, map_chan, map_parm,
-+        return rc->set_mem_all_cb(rig, vfo, map_chan, map_parm,
-                                   (rig_ptr_t)&mem_all_arg);
- 
-     /* if not available, emulate it */
-@@ -1548,7 +1549,7 @@ int HAMLIB_API rig_get_mem_all(RIG *rig,
-     mem_all_arg.vals = vals;
- 
-     if (rc->get_mem_all_cb)
--        return rc->get_mem_all_cb(rig, map_chan, map_parm,
-+        return rc->get_mem_all_cb(rig, vfo, map_chan, map_parm,
-                                   (rig_ptr_t)&mem_all_arg);
- 
-     /*
-diff --git a/tests/testcaps.sh b/tests/testcaps.sh
-new file mode 100755
-index 00000000..7032a2ce
---- /dev/null
-+++ b/tests/testcaps.sh
-@@ -0,0 +1,12 @@
-+#!/bin/sh
-+model=1
-+riglist=`rigctl -l | cut -c1-8 | grep -v Rig | tr -d '\n'`
-+for model in $riglist
-+do
-+   result=`rigctl -m $model -u 2>/dev/null | grep warnings`
-+#   if [[ "$result" == *"warnings: 0"* ]];then
-+       echo $model " " $result
-+#   fi
-+
-+    model=`expr $model + 1`
-+done
--- 
-2.37.4
-
-
-From d7edd89a12be134a904d0a3d5fc3e4f68f111c16 Mon Sep 17 00:00:00 2001
-From: Mike Black W9MDB <mdblack98@yahoo.com>
-Date: Mon, 14 Nov 2022 17:55:25 -0600
-Subject: [PATCH 2/2] Fix memcsv.c https://github.com/Hamlib/Hamlib/issues/1149
-
----
- tests/memcsv.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/memcsv.c b/tests/memcsv.c
-index 8a107549..82becbf4 100644
---- a/tests/memcsv.c
-+++ b/tests/memcsv.c
-@@ -48,6 +48,7 @@ char csv_sep = ','; /* CSV separator */
-  * Prototypes
-  */
- static int dump_csv_chan(RIG *rig,
-+                         vfo_t vfo,
-                          channel_t **chan,
-                          int channel_num,
-                          const chan_t *chan_list,
-@@ -552,6 +553,7 @@ void dump_csv_name(const channel_cap_t *mem_caps, FILE *f)
- 
- /* Caution! Keep the function consistent with dump_csv_name and set_channel_data! */
- int dump_csv_chan(RIG *rig,
-+                  vfo_t vfo,
-                   channel_t **chan_pp,
-                   int channel_num,
-                   const chan_t *chan_list,
--- 
-2.37.4
-
diff --git a/media-libs/hamlib/files/hamlib-4.4-slibtool.patch b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
deleted file mode 100644
index 140534e744b0..000000000000
--- a/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 4fa9a211adbcb1ae9329db41c27854af70f39d64 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 6 May 2022 17:13:36 -0700
-Subject: [PATCH] bindings: Fix tcl build with slibtool
-
----
- bindings/Makefile.am |  3 ++-
- configure.ac         | 16 ++++++++++++----
- macros/tcl.m4        |  1 +
- 3 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index f9f17d567..7e2647945 100644
---- a/bindings/Makefile.am
-+++ b/bindings/Makefile.am
-@@ -149,8 +149,9 @@ PKG_VER = $(ABI_VERSION).$(ABI_REVISION)
- DLL = hamlibtcl-$(PKG_VER)$(TCL_SHLIB_SUFFIX)
- 
- nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
-+hamlibtcl_la_CFLAGS = $(TCL_CFLAGS)
- hamlibtcl_la_LDFLAGS = -no-undefined -module -release $(PKG_VER) -avoid-version
--hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC)
-+hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC) $(TCL_LIBS)
- 
- hamlibtcl_ladir = $(tcldir)
- hamlibtcl_la_DATA = pkgIndex.tcl
-diff --git a/configure.ac b/configure.ac
-index f58eb0925..ab6e120f7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -589,11 +589,16 @@ AC_ARG_WITH([tcl-binding],
-     [build_tcl=no])
- AC_MSG_RESULT([$build_tcl])
- 
--dnl SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
-+dnl tcl.pc or SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
- AS_IF([test x"${build_tcl}" = "xyes"],[
--    dnl Search for and load tclConfig.sh.
--    SC_PATH_TCLCONFIG
--    SC_LOAD_TCLCONFIG
-+    dnl Search for and load tcl.pc or tclConfig.sh.
-+    PKG_CHECK_MODULES([TCL], [tcl],
-+        [],
-+        [
-+            AC_MSG_WARN([Unable to find Tcl pkgconfig])
-+            SC_PATH_TCLCONFIG
-+            SC_LOAD_TCLCONFIG
-+        ])
- 
-     tcl_save_CPPFLAGS=$CPPFLAGS
-     CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
-@@ -617,6 +622,9 @@ AC_SUBST([TCL_VERSION])
- AC_SUBST([TCL_LIB_SPEC])
- AC_SUBST([TCL_INCLUDE_SPEC])
- AC_SUBST([TCL_SHLIB_SUFFIX])
-+dnl These variables are set once tcl.pc is found.
-+AC_SUBST([TCL_LIBS])
-+AC_SUBST([TCL_CFLAGS])
- 
- 
- dnl Check for lua availability, so we can enable HamlibLua
-diff --git a/macros/tcl.m4 b/macros/tcl.m4
-index feed05ce3..c1d308cf4 100644
---- a/macros/tcl.m4
-+++ b/macros/tcl.m4
-@@ -130,6 +130,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
- 	. $TCL_BIN_DIR/tclConfig.sh
-     else
-         AC_MSG_RESULT([file not found])
-+        AC_MSG_ERROR([failed to load tclConfig.sh])
-     fi
- 
-     #
diff --git a/media-libs/hamlib/hamlib-4.4.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild
deleted file mode 100644
index 03c7182e96ec..000000000000
--- a/media-libs/hamlib/hamlib-4.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-PATCHES=(
-	"${FILESDIR}/${P}-slibtool.patch" # 798273
-	"${FILESDIR}/${P}-fix-clang-warnings.patch" # 880961
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/hamlib/hamlib-4.5.3.ebuild b/media-libs/hamlib/hamlib-4.5.3.ebuild
deleted file mode 100644
index cc3babe21d69..000000000000
--- a/media-libs/hamlib/hamlib-4.5.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index e77905a2b367..69fef8277d93 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,5 +1,5 @@
 DIST libchamplain-0.12.20.tar.xz 222168 BLAKE2B 72093eecffca24a5f255269472216f24d0804b7c8daf7cf9dc1273df9afc3fe5664dd2ca7d351bf94065f61bf4a419b3babcf3e9b2ed9a0f67c9947190aaa476 SHA512 514e4bd2803ace0d87a95a318a03bc2f2ccc454129146d76590d1b1f5666c95a4fb7013e2ad0cfafc5844d7d8b732c81a44cd0e7d51c505adcfe55c55abb4f6f
 DIST libchamplain-0.12.21.tar.xz 223748 BLAKE2B afe6b409107d12b8c674d9335d00ca21cf7faf036fd852b48ec371fb76dcd35cc30d4bc3dab555667069d7d41411eea31343240de9bd29dcc2e0f290bc925641 SHA512 8e3b4a292056b1d90be128dab347b1953e6acd00b1abf56fcc496eea15688ef232b81afe39147a9d6059ab248e3ceb7e07683c23501671b93797b0a87faccca9
 EBUILD libchamplain-0.12.20.ebuild 1439 BLAKE2B 2eda03c776f6f66ed777908a77a8772c24c63d03b88a9b9dd15e6bed69f2ad3eccc89b26f2dec520d1fbd6d2287e748a75e4d73fdcace1588ab0f096c624ae84 SHA512 d5bd5193244a61f354510ad8caa177513697d51933a038dcc4a6976b43eb5137f140234022b8a58b9ff6f1164f14e82e88bcc6b9674768aca5b6153361b2ca82
-EBUILD libchamplain-0.12.21.ebuild 1453 BLAKE2B 2c623c4b714b85caa84f9a617275945c13bf2912b0ebb291d9581085dd9bb180f8b3ef0a030f4c207dfae051cf28383bc76178d6ae3cba3db4b37534bed25e6d SHA512 67db82baa1be92efb30b6a0cfd4b04ee30573d9a36c053a8e35f895e9e6454ca94a9f304895fc0cb230b43bf7ee9d587326295b1801116ef4196b34bfb6af0b8
+EBUILD libchamplain-0.12.21.ebuild 1452 BLAKE2B 57195370586b6c847f460e720d2abe71cdc95a4eac75bef6056bdd2e1463fb7437987055acb8ce65cc9feb959838a616e0a024f28bb07c4a3ea2561f7c174972 SHA512 50cb9429fd9a897c2bdf869dd656edebfa265977df06e41d8c738a856f2f3fefcaeffa9857d6b20acecf7b12902b00877c87c545d8ea8dbcba649927f9d175b2
 MISC metadata.xml 731 BLAKE2B 5eebc6658951aa336948a944f02a538988503ce51ec4615a3e40c20b97aef40821b684e3a1421e46cf49bc6151d668f4d16ee655a5a86e7c25f5ace9bc976b71 SHA512 e1fa3a71f9afd87ecc79e751bf23ecb6fa9983d0466a4bc5d10aa8a01eb89d379f8ff3d812823cd3e68cc1b6f75cf4fc49a8b48ac690306a812b0d9c1c7d6f41
diff --git a/media-libs/libchamplain/libchamplain-0.12.21.ebuild b/media-libs/libchamplain/libchamplain-0.12.21.ebuild
index 28d12931004e..8ff83c374d50 100644
--- a/media-libs/libchamplain/libchamplain-0.12.21.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.21.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="+gtk gtk-doc +introspection vala"
 REQUIRED_USE="
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 094c32bccc34..69b3bbe9ab7a 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -2,5 +2,5 @@ DIST libsndfile-1.1.0.tar.xz 730604 BLAKE2B ff2d27bff460c4d3c549bdf70c84c6f17a2c
 DIST libsndfile-1.2.0.tar.xz 730268 BLAKE2B cb13fde9b9f44c6279a9ee7741457824eb41fc17261bf9c669d757e9e506eba2c3d4ad259e4625b8a11c82308188cc19f7399e9d1fc0299a3a11794e4b653e47 SHA512 c0dee6b33cd3c619aa13ec2854a5480e826640ca98a438758346194e83752af576a39f9de118824f0d0c61288632d87b489dc5793c025296e0f15564d87ca12a
 EBUILD libsndfile-1.1.0-r1.ebuild 1912 BLAKE2B b20f8339faa259f3f0381480910e24d5fb69d974a9d6ae52273c13891cb914e7a80ce38fde21b74a3135c5d4961efccd0cd3d3e079b128d22dc130c05a9c2aba SHA512 8d4c0d9d01e54df1f5289cc04a856f6ba8c3529a2a11df100ecb35106662feaeb08a962360b1f2282c79284d840d2667ef296c6bbec144cff3cb90cccdce2d85
 EBUILD libsndfile-1.2.0.ebuild 1912 BLAKE2B 35119e10d062bb94d163ac62b274fe97f85525ad872d7a3d0533c0c8fccd7163744e3dd5aad7908d0697d5119fe655d7525631bde0f8d495455835710a700035 SHA512 cd0ed5f8d61f6eaeb7553afbf1ec7a2f899e489e66c48ff1b419e8794d04d05d101777fd3684fb601c0e70ba4621c7712412526b8154df6b1a20877f889fd783
-EBUILD libsndfile-9999.ebuild 1912 BLAKE2B 9f3eb737c48715633a9b3ff701f70813fbc6c60291ccb6d82b2e23fe3798ad5e6862e1fbe7daa80497804eccba4f8895382bdd026e5667e588415bcd7d328f6d SHA512 87b39080034d5f4166b9e73079abe489b3af5b58ff16ca638c79575bd4834c729904ab097e167d7f6adec058418a3fb1d097a3961c6cb66badb9640d4f23d37f
+EBUILD libsndfile-9999.ebuild 1912 BLAKE2B e2f4583eac220f8de637325465c15002de0884d1343b7c2f5ed0ffdd4f9caff25e204a959b4bc4cfd96bcb359005b23153bdaadc3916add055fee6ab3d712c2d SHA512 96f6dd0fe04bb38aacfa0466e32c7d1e14eb6c923d1ccadded7b342911a1aaeeadbfc9014d3b6364a885348cc2e752c40205c7869b4c75a7b1971ba1277fc8ca
 MISC metadata.xml 340 BLAKE2B 26c245d58463cd3d14645b476de30407e51e47777d36dff251f0f68d9e981e8b6d95cf9aacc51d08feb4f1e550152f38b66d8dae23c40fd1b65702d59044b05a SHA512 54f132b485fc720dc0e1c311370dbc5f7ed4d3a1c8271aafeb9f01fef411df95f0cd55d605debcc3477fcc07aab4b298c240084e70df19a10b1b22c33d57b9c2
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index e1920d848d94..0501569610b4 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3