gentoo auto-resync : 28:01:2025 - 22:42:58

8 files changed, 114 insertions, 12 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 076005f8c18b..151737e8ddd9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 3ecb2826dbe9..18e47abb887e 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,6 +1,7 @@
 AUX hamlib-4.5.5-gcc14-fix.patch 224 BLAKE2B 882645207d62657b790e76d5e4d3a17be3aca9dfd978d5a2939bfc81a018788e6a2b3d1f37bf2d0e122740014e076820dfc9c626d24509741b1342ec700d2a75 SHA512 1529f2002de0e9c216dad0f4bcf0656fb70da543ab0f84d19e8a1621e87d9983f43f7bbc05cae09ab3a2310628b7522c152f15861f32adad05c9088e36b01acd
+AUX hamlib-drop-lua.patch 2552 BLAKE2B 85ce143502baf4fb6ff4b58708e31308ef57d92bb51ce658f22bd50a27c9edb9213d16690afda2be701d204723ba6b4fe64b189b3db61734e7427e681dc4b4eb SHA512 bc607cb1b82c4a2ffcd1eb244a99d6a70c4768a674343b604e64413d13b397e6f0cdd8dc684079941e30decffd16c3b625814d6c01a643e27030d254308ec2c0
 DIST hamlib-4.5.5.tar.gz 2603846 BLAKE2B ad4a286a7aa1e972707cb9ed15a4268909a7d252a64b98b01d35c9d9e42c605cd600e819e195e49d501c1e135191fda585581e27801fa217c9141236a81ad770 SHA512 2cdff2630e89fa95c7ac40e998492e8a04e000fcca18b9491ddcb967927ffaa771ed2e6ac3232a060947883533a6ae7405042a2f8fdb1de157d71f74381f5899
 DIST hamlib-4.6.1.tar.gz 2909273 BLAKE2B d8ab443bd19068ec76fbe021f9dcdbaf3cead9a6eac1eab47c148c35fe7c98d294d50386cc3c386e8113ac26a9aa594f7a9d121e81601c84660350115566b1b6 SHA512 3363665e2fc5541e2bd68767e9c0d8c856a7d2ea9a7e4a2d7e79d6e7349150642cba4e96d27ab6dc029fd838e05c3f0f9f7acadcc7c8bc51bedaf61ef67e95ce
-EBUILD hamlib-4.5.5-r3.ebuild 2207 BLAKE2B 085c5dbad4fdaa2d4c6a7e2831aca85ae77de74d9b3d3167d382bff110804db87b85543c80ffa2407eaa1f562d570c9e2e9bcf272f92acae4ae8021d737694a4 SHA512 33a2f3843d80a1c29ab995e48c4c9c9913e26c2b204e75033bce9d9a1f01bbc650abb935bdfae85446ade5eff034b52263fe6124ca7525334c509aab52a0c811
-EBUILD hamlib-4.6.1.ebuild 2153 BLAKE2B a838be1a79f8ce5eaf5c6b104e0d0cf802141ce59e1e8b5c7acfc7ed45d2bae3591d17a22a97ff74c29a220d37d3e3600d93fc20b735f471a89a55d7f3d22006 SHA512 a3ce15e167e64623053e7ab1021f3af0dae8190cec608ca70eae37318eb886ad3c2b2a8a794563160f1b6d120b92d6aad5d5ae38abe38c99e9c3c920f30d24cd
+EBUILD hamlib-4.5.5-r4.ebuild 2243 BLAKE2B 371b9395f8e23416e6c1c4888a9f042c6a61addd2c34f9e490d6c6cbcb5601178ad388dbcdc3d088393076dd2af4894fd4f076d23ae08c1eb1ca2a89345377dd SHA512 aaad3a98efa668a1cd8a995999afa5011da535dca86b1baf95ec496be90db03c7ba1551b5852c6a4889021277cb82050b6f1c16b88c57418a223ed474ba3aa8e
+EBUILD hamlib-4.6.1.ebuild 2200 BLAKE2B 11c3f87bfca183c23e980121083badb40c7679bc0065a2bad0501fdc9739a5c33f414f926fcf03237b5616c8527150c538f1991eb6414293fd314cfec89bf35e SHA512 80ea3deb9bae2813c790c5257c912f01b1c688d8e20377526b7603f670077bb66c167e9736028adf021ca44f3185a98720b91b9a12c6e9a795072b6ebbe30664
 MISC metadata.xml 379 BLAKE2B 17bfaa1ae7f031e14bef4bad4d552e3d4b644b9578bd996a9e8454b6b55f4029c3395e8a1cfc5a2b27a5372cd1aea140e0aebe637f7eb7889008fb434897b681 SHA512 c8c7a37088c0da4952a557776db8b6b701df23c07c4b17c50b77a199a6e7740369e27254eabae4e504ecb07871d33aec008e54bc7a787030828616ab36dfcb93
diff --git a/media-libs/hamlib/files/hamlib-drop-lua.patch b/media-libs/hamlib/files/hamlib-drop-lua.patch
new file mode 100644
index 000000000000..aae145c0ddeb
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-drop-lua.patch
@@ -0,0 +1,88 @@
+diff --git a/configure.ac b/configure.ac
+index 609db45..fe0ad42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -666,34 +666,6 @@ AC_SUBST([TCL_LIBS])
+ AC_SUBST([TCL_CFLAGS])
+ 
+ 
+-dnl Check for lua availability, so we can enable HamlibLua
+-# Lua bindings
+-AC_MSG_CHECKING([whether to build lua binding])
+-AC_ARG_WITH([lua-binding],
+-    [AS_HELP_STRING([--with-lua-binding],
+-	[build lua binding @<:@default=no@:>@])],
+-    [cf_with_lua_binding=$withval],
+-    [cf_with_lua_binding=no])
+-AC_MSG_RESULT([$cf_with_lua_binding])
+-
+-dnl AX_LUA_DEVEL from macros/ax_lua_devel.m4
+-AS_IF([test x"${cf_with_lua_binding}" = "xyes"],[
+-
+-    AX_PROG_LUA([5.2], [5.5])
+-    AX_LUA_HEADERS
+-    AX_LUA_LIBS
+-
+-    BINDING_LIST="${BINDING_LIST} lua"
+-    BINDING_ALL="${BINDING_ALL} all-lua"
+-    BINDING_CHECK="${BINDING_CHECK} check-lua"
+-    BINDING_CLEAN="${BINDING_CLEAN} clean-lua"
+-    BINDING_DISTCLEAN="${BINDING_DISTCLEAN} distclean-lua"
+-    BINDING_INSTALL_EXEC="${BINDING_INSTALL_EXEC} install-lua"
+-    BINDING_UNINSTALL="${BINDING_UNINSTALL} uninstall-lua"
+-    BINDING_LIB_TARGETS="${BINDING_LIB_TARGETS} \$(lua_ltlib)"])
+-
+-AM_CONDITIONAL([ENABLE_LUA], [test x"${cf_with_lua_binding}" = "xyes"])
+-
+ 
+ dnl Only search for Swig if one or more bindings are enabled.
+ AS_IF([test "x${BINDING_ALL}" != "x"],
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index fa75abc..75319ff 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -191,44 +191,7 @@ uninstall-tcl:
+ endif
+ # TCL
+ 
+-if ENABLE_LUA
+-##########################################
+-# Lua binding
+-
+-luaexec_ltlib = Hamliblua.la
+-
+-MOSTLYCLEANFILES += hamliblua_wrap.c
+-BUILT_SOURCES += hamliblua_wrap.c
+-example_DATA += luatest.lua
+-
+-nodist_luaexec_LUA = Hamlib.lua
+-nodist_Hamliblua_la_SOURCES = hamliblua_wrap.c
+-
+-Hamliblua_la_CPPFLAGS = $(LUA_INCLUDE) -I$(top_srcdir)/include -I$(top_srcdir)/src
+-Hamliblua_la_LDFLAGS = -no-undefined -module -avoid-version
+-Hamliblua_la_LIBADD = $(top_builddir)/src/libhamlib.la
+-Hamliblua_ladir = $(luaexecdir)
+-Hamliblua_la_LTLIBRARIES = $(luaexec_ltlib)
+-
+-all-lua: $(luaexec_ltlib)
+ 
+-check-lua: all-lua
+-	$(AM_V_at)LUA_CPATH="$(abs_builddir)/.libs/?.so" $(LUA) $(srcdir)/luatest.lua \
+-		|| echo "Lua test failed" 1>&2
+-
+-Hamlib.lua: hamliblua_wrap.c
+-
+-hamliblua_wrap.c: hamlib.swg $(SWGDEP)
+-	$(AM_V_GEN)$(SWIG) -lua $(AM_CPPFLAGS) -I$(top_srcdir)/bindings \
+-		-o $@ $$(test -f hamlib.swg || echo '$(srcdir)/')hamlib.swg
+-
+-install-lua:
+-clean-lua:
+-distclean-lua:
+-uninstall-lua:
+-
+-endif
+-# Lua
+ 
+ 
+ all-local: @BINDING_ALL@
diff --git a/media-libs/hamlib/hamlib-4.5.5-r3.ebuild b/media-libs/hamlib/hamlib-4.5.5-r4.ebuild
index daa89b08622c..460369f15605 100644
--- a/media-libs/hamlib/hamlib-4.5.5-r3.ebuild
+++ b/media-libs/hamlib/hamlib-4.5.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,6 +42,7 @@ DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.5.5-gcc14-fix.patch"
+	 "$FILESDIR/hamlib-drop-lua.patch"
 )
 
 pkg_setup() {
diff --git a/media-libs/hamlib/hamlib-4.6.1.ebuild b/media-libs/hamlib/hamlib-4.6.1.ebuild
index 0aa7bcf6e296..6b606145abd6 100644
--- a/media-libs/hamlib/hamlib-4.6.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.6.1.ebuild
@@ -40,6 +40,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
 
+PATCHES=( "$FILESDIR/hamlib-drop-lua.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 6d0123a2044a..9b630dc4f742 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,5 +1,6 @@
+AUX suil-0.10.22-fix-gtk2-option.patch 303 BLAKE2B 237767341dbddf910f29a2f4f613aa517d7af88c3abe66052e4f040972fd8f76f0c812e197b01f2fc3509cd63107ebd532f8ebc5e34dbfa91a2e4e3e62d65b0d SHA512 436ed76b31928662bdb326d60c84ad886cc5ffac1674704e910ac12d71222a39400f4efefc5ab34ba6b0850df3fe63e2cf38748a9911ab59f3eb30532a1e1b76
 DIST suil-0.10.20.tar.xz 27492 BLAKE2B 4ce6dcba544b4fb606d2b97dd347e5098cd1373643059fe80e2a7f9d7022432063e4391017e106a4092056999dcb7b99729339536c4c73cdaa5a3f091f1100ee SHA512 fb3735d0856c826f46ad2334b6965f4116df2fa3132d10bdfcd2b2d39f8e40142801ce3f352425845adfac90bf4a60d76d09fdf0a99b2cec82faa0f5f127c3f8
 DIST suil-0.10.22.tar.xz 28428 BLAKE2B ba483b0307ff522479d738bf90cca2efabb1f73e5c912ce3c94a690114937d6014a6f4a28e4173bb7ae3d669e88e9332c9beca505649080523cdf0dab319f38c SHA512 fe2f30acd4c6f586ad3b08e5a5fac26a902848065b944852406ae51b74fa5fdbb0ff2417c538cd803ad47074248353c2d704698bcd5e64ade174deb4b5701f7e
 EBUILD suil-0.10.20.ebuild 1403 BLAKE2B 8a0b66da2a3598121b92914a7604205a8b055ca6950bd651bcd2dbcfc20b8f4b1c0fcf9ec53333302216a8af8ae0637a9e1f1dcaa2bbbaa727d16b247409648f SHA512 c4256e176af3654d3cca308e74419c9eeb4baf68851e3ba7e699579719fa1b97df80c1d461e5dbf54cd90a93bb476b074c079e9fc5f8b95d635b036bcf2bee14
-EBUILD suil-0.10.22.ebuild 1407 BLAKE2B c03e33f63548dea7c149ecf17e62c3f74a1516e806e31c0acf909073ecf49814c0547d61267b82094c68e180e15cb04c8fed0c3e65e680dc8088881858f4bae6 SHA512 3c5326f170fe881f2a4b65d7f75ad8c917b3d19bf531f611e3cbb755800774407f7672f57d88f528dfe2332845c4d307bf67227da0c371eeca3611ccb43c887d
+EBUILD suil-0.10.22-r1.ebuild 1427 BLAKE2B b87b8c2cff8bd5dc43f6f13d7d97b507bc745d422eaa2f0851d7c6c11db759435669d5d9951e929b71e446c6781ec0cd623fa1143187b462565d3fb2b3a3a964 SHA512 b23950e5553bbd1e90985e100e08781b629eb4f708a61b95c4d2af7fd344242b3ff199b7dbb564f18119dea7585126f3994d077371da949acc77dad4a4142c0b
 MISC metadata.xml 688 BLAKE2B d79aaa92cb5c0b410e82d5fb69e8eb671573a99cd1b76cf935331176fbeff653742286898034b5e86b71766cf70ac726355c8ebfba4d4b603a6052765543e5cc SHA512 60c406e64c6848fbe9616f8731bcdccd0aa24a9a1250cbd7d4338586fb10374e36e92f2202343a04c59c06f80208708505866fb58aac573b27b553d343ed0b6b
diff --git a/media-libs/suil/files/suil-0.10.22-fix-gtk2-option.patch b/media-libs/suil/files/suil-0.10.22-fix-gtk2-option.patch
new file mode 100644
index 000000000000..4ed776ddb211
--- /dev/null
+++ b/media-libs/suil/files/suil-0.10.22-fix-gtk2-option.patch
@@ -0,0 +1,11 @@
+--- a/meson.build	2025-01-19 14:59:34.000000000 +0100
++++ b/meson.build	2025-01-28 18:55:30.964917952 +0100
+@@ -215,7 +215,7 @@
+   'gtk+-2.0',
+   include_type: 'system',
+   version: '>=2.18.0',
+-  required: get_option('gtk2').enabled(),
++  required: get_option('gtk2'),
+ )
+ 
+ gtk2_x11_dep = dependency(
diff --git a/media-libs/suil/suil-0.10.22.ebuild b/media-libs/suil/suil-0.10.22-r1.ebuild
index d6868d9cd9f7..66705064ac51 100644
--- a/media-libs/suil/suil-0.10.22.ebuild
+++ b/media-libs/suil/suil-0.10.22-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.drobilla.net/${P}.tar.xz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc gtk gtk2 qt5 test X"
+IUSE="doc gtk gtk2 qt6 test X"
 RESTRICT="!test? ( test )"
 
 # This could be way refined, but it's quickly a rabbit hole
@@ -27,12 +27,7 @@ RDEPEND="
 		>=x11-libs/gtk+-3.14.0:3
 		dev-libs/glib:2
 	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
 	X? ( x11-libs/libX11 )
 "
 DEPEND="${RDEPEND}"
@@ -49,6 +44,8 @@ BDEPEND="
 
 DOCS=( AUTHORS NEWS README.md )
 
+PATCHES=( "${FILESDIR}/${P}-fix-gtk2-option.patch" )
+
 src_prepare() {
 	default
 
@@ -58,10 +55,11 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		-Dqt5=disabled
 		$(meson_feature doc docs)
 		$(meson_feature gtk2)
 		$(meson_feature gtk gtk3)
-		$(meson_feature qt5)
+		$(meson_feature qt6)
 		$(meson_feature test tests)
 		$(meson_feature X x11)
 	)