From fc4ad6e568738af8995c2e87896c671c39eb8c72 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Jan 2025 22:42:59 +0000 Subject: gentoo auto-resync : 28:01:2025 - 22:42:58 --- media-libs/hamlib/Manifest | 5 +- media-libs/hamlib/files/hamlib-drop-lua.patch | 88 ++++++++++++++++++++++ media-libs/hamlib/hamlib-4.5.5-r3.ebuild | 101 ------------------------- media-libs/hamlib/hamlib-4.5.5-r4.ebuild | 102 ++++++++++++++++++++++++++ media-libs/hamlib/hamlib-4.6.1.ebuild | 2 + 5 files changed, 195 insertions(+), 103 deletions(-) create mode 100644 media-libs/hamlib/files/hamlib-drop-lua.patch delete mode 100644 media-libs/hamlib/hamlib-4.5.5-r3.ebuild create mode 100644 media-libs/hamlib/hamlib-4.5.5-r4.ebuild (limited to 'media-libs/hamlib') 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-r3.ebuild deleted file mode 100644 index daa89b08622c..000000000000 --- a/media-libs/hamlib/hamlib-4.5.5-r3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -MY_P=${P/_rc2/~rc2} - -inherit autotools flag-o-matic python-single-r1 - -DESCRIPTION="Ham radio backend rig control libraries" -HOMEPAGE="https://www.hamlib.github.io" -SRC_URI="https://downloads.sourceforge.net/hamlib/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -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}" -BDEPEND=" - virtual/pkgconfig - dev-lang/swig - >=dev-build/libtool-2.2 - doc? ( app-text/doxygen - dev-util/source-highlight )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer) - -PATCHES=( - "${FILESDIR}/${PN}-4.5.5-gcc14-fix.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # 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() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/926839 - # https://github.com/Hamlib/Hamlib/issues/1524 - filter-lto - - 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.5-r4.ebuild b/media-libs/hamlib/hamlib-4.5.5-r4.ebuild new file mode 100644 index 000000000000..460369f15605 --- /dev/null +++ b/media-libs/hamlib/hamlib-4.5.5-r4.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +MY_P=${P/_rc2/~rc2} + +inherit autotools flag-o-matic python-single-r1 + +DESCRIPTION="Ham radio backend rig control libraries" +HOMEPAGE="https://www.hamlib.github.io" +SRC_URI="https://downloads.sourceforge.net/hamlib/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +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}" +BDEPEND=" + virtual/pkgconfig + dev-lang/swig + >=dev-build/libtool-2.2 + doc? ( app-text/doxygen + dev-util/source-highlight )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +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() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/926839 + # https://github.com/Hamlib/Hamlib/issues/1524 + filter-lto + + 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.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 } -- cgit v1.2.3