gentoo resync : 12.05.2022

4 files changed, 88 insertions, 6 deletions

diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 7bdecab0d0e9..95012fd4b9b8 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,6 @@
+AUX hamlib-4.4-slibtool.patch 2414 BLAKE2B 798b95d72e57d1b68a1d26c36f631b084722a32ae3c20238f7cb2495412e200ee7e909d2e614ad27db7016654a6e662834b8c95f86dbec609754fe817a49a1b8 SHA512 743a5be7160e80453810873ea074fd62934524fcf7fc9b8e224c93a2876760c96793ebb13e6e40c32b648065b034a2355935862d540c6620babaeacb7fc2f88c
 DIST hamlib-4.3.1.tar.gz 2356944 BLAKE2B c803d253c867303cbde98b6f2e10f610aac111b7bd81fd343e1396cb86384b1c26942e5ccb8e395e073f9aa3d48e6f9edc1b64da14b2ec5ca09f98fbd3dee667 SHA512 8dee4676a19de7ac1ef733a4285b76e918f11aad6594d0557d36df295faf04c615e0993edb2f9ed5e7aea718c184603fec831caf28b75026c705f0b2e4b9eca7
 DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
-EBUILD hamlib-4.3.1.ebuild 2087 BLAKE2B f9bcfec7f4c00bd47e11aef68fb7c654ef4aba2989f25a1b1092766e7fca445d5c24047e240ac65ab359432b9aa32d6d6b0fea54e2659e515280fb840def7ddf SHA512 759eecc58675fe9899cd50d5ec1fda46a61e328c91eeb6e4ede7a02d3000ed07b07e4d42e9c09e35db11cad56f757aa710cc4ae070f1c3a10a98301021d71f80
-EBUILD hamlib-4.4.ebuild 2101 BLAKE2B 0f79cbf701ba16823387ec54b3f238b7bf566645da15b5ab94d905471b3328e7b0fcf034246a0f3f0035050fb15e80bb297b2c1c48d38b02f848144b778e73bf SHA512 f8e3db88a05bc7c2e26fba93c07c52c8d26558d13ce34dee006b6b2e3529d736f7538edc4ca0290b7ba2b6be616bd405d24f5d204db59e1f9f6e80a854a83383
+EBUILD hamlib-4.3.1.ebuild 2130 BLAKE2B a84beb5f391f6114ac71438a3d4a5f07e48759d63ec9de84533c3fcd47930ca1e2c245ce8c303bb7b18ba3cc664dfe9b40fc333510c877480fb90b49e22c6769 SHA512 f8bfd63869e2efcdc6fec97a66c63427d8e8338eab3fe5bfe45224fb2c9741cfd313dee20642ccca50b86a52dbbd3aba51025c3b68f7fbe854b5fc995797cc7c
+EBUILD hamlib-4.4.ebuild 2202 BLAKE2B 89d6c0167fad4c364306ae47bdd6771f113a8ea5347479eed2a8a961ade22cf54f2a45964c8f251117d1a2bc39c7bdb46a3a2dc78c433e69fd419ed529c8fb1f SHA512 67a69077113be053ebf53a8047cb4ba7838185b9e9f027e0162cb3bb87e6928ba951002ed435d5c11bc00ed20c7a179ee60f1d6bd820410e57e04d0adf672eef
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/files/hamlib-4.4-slibtool.patch b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
new file mode 100644
index 000000000000..140534e744b0
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
@@ -0,0 +1,73 @@
+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.3.1.ebuild b/media-libs/hamlib/hamlib-4.3.1.ebuild
index ab42e282b753..905bf3bb1fd3 100644
--- a/media-libs/hamlib/hamlib-4.3.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -92,4 +92,6 @@ src_install() {
 
 	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.4.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild
index e29daf2b83f0..7a49e5967232 100644
--- a/media-libs/hamlib/hamlib-4.4.ebuild
+++ b/media-libs/hamlib/hamlib-4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0/4.2"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
@@ -38,6 +38,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch" # 798273
+)
+
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -45,6 +49,8 @@ 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#" \
@@ -60,8 +66,6 @@ src_prepare() {
 	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
 
 	eautoreconf
-
-	eapply_user
 }
 
 src_configure() {
@@ -92,4 +96,6 @@ src_install() {
 
 	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
 	doenvd "${T}"/73hamlib
+
+	find "${ED}" -name '*.la' -delete || die
 }