diff options
Diffstat (limited to 'dev-libs')
977 files changed, 21019 insertions, 9807 deletions
diff --git a/dev-libs/FBGEMM/FBGEMM-2023.11.02.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.11.02.ebuild new file mode 100644 index 000000000000..e4307e16afe8 --- /dev/null +++ b/dev-libs/FBGEMM/FBGEMM-2023.11.02.ebuild @@ -0,0 +1,79 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit python-any-r1 flag-o-matic cmake + +CommitId=cdae5d97e3aa9fda4222f31c04dbd80249c918d1 + +DESCRIPTION="Facebook GEneral Matrix Multiplication" +HOMEPAGE="https://github.com/pytorch/FBGEMM" +SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" + +DEPEND=" + >=dev-libs/asmjit-2022.07.02 + dev-libs/cpuinfo +" +RDEPEND="${DEPEND}" +BDEPEND=" + test? ( dev-cpp/gtest ) + doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + dev-python/breathe[${PYTHON_USEDEP}] + ') + ) + ${PYTHON_DEPS} +" +RESTRICT="!test? ( test )" + +S="${WORKDIR}"/${PN}-${CommitId} + +python_check_deps() { + if use doc; then + python_has_version \ + "dev-python/sphinx[${PYTHON_USEDEP}]" \ + "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \ + "dev-python/breathe[${PYTHON_USEDEP}]" + fi +} + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + +src_prepare() { + # Bug #855668 + filter-lto + + rm test/RowWiseSparseAdagradFusedTest.cc || die + rm test/SparseAdagradTest.cc || die + sed -i \ + -e "/-Werror/d" \ + CMakeLists.txt \ + || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DFBGEMM_LIBRARY_TYPE=shared + -DFBGEMM_BUILD_BENCHMARKS=OFF + -DFBGEMM_BUILD_DOCS=$(usex doc ON OFF) + -DFBGEMM_BUILD_TESTS=$(usex test ON OFF) + ) + cmake_src_configure +} + +src_test() { + OMP_STACKSIZE=512k cmake_src_test +} diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest index 5ca7cee0d7e4..537d3f459c6a 100644 --- a/dev-libs/FBGEMM/Manifest +++ b/dev-libs/FBGEMM/Manifest @@ -1 +1,2 @@ DIST FBGEMM-2023.02.10.tar.gz 854918 BLAKE2B 2af11baf95c1f33e1b1dd6f2a51dde2c991ff0f606402a7aaa539b7bc505c3707cafaa96d8f742c91672ec09a1f18a69f0e69c012b6db11d5297d602b8f4860c SHA512 a59d928150d674c56b5d38f73e62b5f4e2b527ea1f7ebb891ea1d3356e4183e0f469d145fca37fcb1c85f8773cf54226a8e41389fe9783474c457a7bd31846d6 +DIST FBGEMM-2023.11.02.tar.gz 895265 BLAKE2B 0f884147a86881159485680f1cb0c7b7e65bba5a98e62c38534041264f920e08a268e348e3d82ba3d246226a10f592d86dc37bce0cfa42c72dad478041a6c807 SHA512 030f27a120586240c5f80026bd033cf6fedbe1ae12a667308d33d6321f2334021d474a3625795d1f34734336b688b19c09134e10d5cc8dec86e84485de298584 diff --git a/dev-libs/FBGEMM/files/FBGEMM-2023.11.02-gentoo.patch b/dev-libs/FBGEMM/files/FBGEMM-2023.11.02-gentoo.patch new file mode 100644 index 000000000000..6ff4950211a2 --- /dev/null +++ b/dev-libs/FBGEMM/files/FBGEMM-2023.11.02-gentoo.patch @@ -0,0 +1,69 @@ +--- a/CMakeLists.txt 2022-05-21 13:13:50.806813151 +0200 ++++ b/CMakeLists.txt 2022-05-21 13:16:46.448969453 +0200 +@@ -225,7 +225,7 @@ + message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") + message(WARNING "==========") + +-if(NOT TARGET asmjit) ++if(FALSE) + #Download asmjit from github if ASMJIT_SRC_DIR is not specified. + if(NOT DEFINED ASMJIT_SRC_DIR) + set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" +@@ -254,7 +254,7 @@ + endif() + endif() + +-if(NOT TARGET cpuinfo) ++if(FALSE) + #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. + if(NOT DEFINED CPUINFO_SOURCE_DIR) + set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" +@@ -330,9 +330,6 @@ + target_link_libraries(fbgemm + $<BUILD_INTERFACE:asmjit> + $<BUILD_INTERFACE:cpuinfo>) +-add_dependencies(fbgemm +- asmjit +- cpuinfo) + + if(OpenMP_FOUND) + target_link_libraries(fbgemm OpenMP::OpenMP_CXX) +@@ -349,6 +346,9 @@ + FILES ${FBGEMM_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm") + ++install(FILES src/RefImplementations.h ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm/src") ++ + install( + EXPORT fbgemmLibraryConfig + DESTINATION share/cmake/fbgemm +--- a/test/CMakeLists.txt 2022-05-21 13:15:34.140135199 +0200 ++++ b/test/CMakeLists.txt 2022-05-21 13:17:59.170813431 +0200 +@@ -8,7 +8,7 @@ + set(CMAKE_C_EXTENSIONS OFF) + set(CMAKE_C_STANDARD_REQUIRED ON) + +-if(FBGEMM_BUILD_TESTS AND NOT TARGET gtest) ++if(FALSE) + #Download Googletest framework from github if + #GOOGLETEST_SOURCE_DIR is not specified. + if(NOT DEFINED GOOGLETEST_SOURCE_DIR) +@@ -72,7 +72,6 @@ + target_link_libraries(${TESTNAME} ${OpenMP_CXX_LIBRARIES}) + endif() + +- add_dependencies(${TESTNAME} gtest fbgemm) + add_test(${TESTNAME} ${TESTNAME}) + set_target_properties(${TESTNAME} PROPERTIES FOLDER test) + endmacro() +--- a/src/PackMatrix.cc 2022-05-24 08:19:00.639462626 +0200 ++++ b/src/PackMatrix.cc 2022-05-24 08:27:59.127720548 +0200 +@@ -30,6 +30,7 @@ + } + + template <typename PT, typename inpType, typename accType> ++FBGEMM_API + int PackMatrix<PT, inpType, accType>::packedBufferSize( + int rows, + int cols, diff --git a/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild b/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild index 454495945d21..2237546d365e 100644 --- a/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild +++ b/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild @@ -15,8 +15,6 @@ SLOT="0" KEYWORDS="~amd64" IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" diff --git a/dev-libs/Ice/Ice-3.7.8-r1.ebuild b/dev-libs/Ice/Ice-3.7.8-r1.ebuild deleted file mode 100644 index 4def5e25988d..000000000000 --- a/dev-libs/Ice/Ice-3.7.8-r1.ebuild +++ /dev/null @@ -1,258 +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} ) - -RUBY_OPTIONAL="yes" -USE_RUBY="ruby30" - -PHP_EXT_NAME="IcePHP" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -PHP_EXT_OPTIONAL_USE=php - -USE_PHP="php8-0 php8-1 php8-2" - -inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs - -DESCRIPTION="ICE middleware C++ library and generator tools" -HOMEPAGE="https://zeroc.com/products/ice" -SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz - doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )" -LICENSE="GPL-2" -SLOT="0/37" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="debug doc examples php python ruby test" -RESTRICT="test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=app-arch/bzip2-1.0.5 - >=dev-libs/expat-2.0.1 - dev-libs/libedit - dev-cpp/libmcpp - dev-db/lmdb:= - dev-libs/openssl:0= - virtual/libcrypt:= - python? ( ${PYTHON_DEPS} ) - ruby? ( $(ruby_implementation_depend ruby30) )" -DEPEND="${RDEPEND} - test? ( - ${PYTHON_DEPS} - dev-python/passlib[${PYTHON_USEDEP}] - )" - -# Maintainer notes: -# TODO: java bindings - -S="${WORKDIR}/${P,}" -PHP_EXT_S="${S}/php" - -PATCHES=( - "${FILESDIR}/${P}-fix-musl-build.patch" - "${FILESDIR}/${P}-py3k11.patch" -) - -pkg_setup() { - # prevent ruby-ng.eclass from messing with pkg_setup - return -} - -src_unpack() { - # prevent ruby-ng.eclass from messing with src_unpack - default -} - -src_prepare() { - default - - sed -i \ - -e 's|-Werror ||g' \ - config/Make.rules.Linux || die - - # fix for x86 IceBox test - sed -i \ - -e 's|"32"|""|' \ - scripts/IceBoxUtil.py || die - - if use !test; then - # Disable building tests - sed -i \ - -e 's|include \$(top_srcdir)/config/Make.tests.rules||' \ - config/Make.rules || die - fi -} - -src_configure() { - MAKE_RULES=( - "embedded_runpath_prefix=\"${EPREFIX}/usr\"" - "OPTIMIZE=$(usex !debug)" - "V=1" - ) - - if use python; then - local S="${S}/python" - python_copy_sources - fi - - if use ruby; then - SITERUBY="$(ruby30 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" - SITERUBYARCH="$(ruby30 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" - MAKE_RULES_RUBY=( - "install_rubydir=\"${EPREFIX}/${SITERUBY}\"" - "install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\"" - ) - - # make it use ruby30 only - sed -i \ - -e 's|RUBY ?= ruby|\030|' \ - ruby/config/Make.rules || die - sed -i \ - -e 's|env ruby|\030|' \ - ruby/config/s2rb.rb || die - sed -i \ - -e 's|env ruby|\030|' \ - ruby/scripts/slice2rb || die - fi - - use test && python_setup -} - -src_compile() { - # Do not remove this export or build will break! - tc-export CXX - - emake -C cpp "${MAKE_RULES[@]}" - - if use php; then - local i - for i in $(php_get_slots); do - mkdir -p "${WORKDIR}/${i}" || die - cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory" - - pushd "${WORKDIR}/${i}" >/dev/null || die - ln -s "${S}/cpp" || die - ln -s "${S}/config" || die - ln -s "${S}/slice" || die - ln -s "${S}/Makefile" || die - - emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\"" - popd >/dev/null || die - done - fi - - if use python; then - building() { - emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}" - } - local S="${S}/python" - python_foreach_impl building - fi - - if use ruby; then - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" - fi -} - -src_test() { - local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" - emake -C cpp "${MAKE_RULES[@]}" test - - # php tests require the extension loaded and are therefore skipped - - if use python; then - testing() { - PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \ - "${MAKE_RULES[@]}" \ - PYTHON="${EPYTHON}" \ - install_pythondir="\"$(python_get_sitedir)\"" \ - install_libdir="\"$(python_get_sitedir)\"" test - } - local S="${S}/python" - python_foreach_impl testing - fi - - if use ruby; then - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test - fi -} - -src_install() { - local DOCS=( CHANGELOG*.md README.md ) - use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" ) - einstalldocs - - MAKE_RULES_INSTALL=( - "prefix=\"${ED}/usr\"" - "install_docdir=\"${ED}/usr/share/doc/${PF}\"" - "install_configdir=\"${ED}/usr/share/${P}/config\"" - "install_mandir=\"${ED}/usr/share/man/man1\"" - ) - - insinto /usr/share/${P} - doins -r slice - - emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install - - if use examples; then - docinto examples-cpp - dodoc cpp/config/*.cfg - docompress -x /usr/share/doc/${PF}/examples-cpp - fi - - if use php; then - insinto "/usr/share/php/${PN}" - - local i - while IFS="" read -d $'\0' -r i; do - doins "${i}" - done < <(find "${S}/php/lib/" -name '*.php' -print0) - - pushd "${ED}/usr/share/${P}/slice" >/dev/null || die - - local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - for i in *; do - mkdir -p "${ED}/usr/share/php/${i}" || die - "${ED}"/usr/bin/slice2php \ - -I"${ED}/usr/share/${P}/slice/" --all \ - --output-dir "${ED}/usr/share/php/${i}" \ - --ice "${ED}/usr/share/${P}/slice/${i}"/* - done - - for i in $(php_get_slots); do - php_init_slot_env "${i}" - insinto "${EXT_DIR}" - newins "php/lib/ice.so" "${PHP_EXT_NAME}.so" - done - php-ext-source-r3_createinifiles - - popd >/dev/null || die - fi - - if use python; then - installation() { - mkdir -p "${D}/$(python_get_sitedir)" || die - - emake -C "${BUILD_DIR}" \ - "${MAKE_RULES[@]}" \ - "${MAKE_RULES_INSTALL[@]}" \ - install_pythondir="\"${D}/$(python_get_sitedir)\"" \ - install_libdir="\"${D}/$(python_get_sitedir)\"" \ - install - python_optimize - } - local S="${S}/python" - python_foreach_impl installation - fi - - if use ruby; then - MAKE_RULES_RUBY=( - "install_rubydir=\"${ED}/${SITERUBY}\"" - "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" - ) - dodir "${SITERUBY}" - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install - fi -} diff --git a/dev-libs/Ice/Ice-3.7.8-r2.ebuild b/dev-libs/Ice/Ice-3.7.8-r2.ebuild index d5b02cf406ba..856169e328a6 100644 --- a/dev-libs/Ice/Ice-3.7.8-r2.ebuild +++ b/dev-libs/Ice/Ice-3.7.8-r2.ebuild @@ -24,7 +24,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )" LICENSE="GPL-2" SLOT="0/37" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="debug doc examples php python ruby test" RESTRICT="test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/aml/aml-0.3.0.ebuild b/dev-libs/aml/aml-0.3.0.ebuild index a7c7dfbf2a1a..aeb693e070ed 100644 --- a/dev-libs/aml/aml-0.3.0.ebuild +++ b/dev-libs/aml/aml-0.3.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/any1/aml.git" else SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="ISC" diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest index 9edbdb510727..f90b1578a0ae 100644 --- a/dev-libs/angelscript/Manifest +++ b/dev-libs/angelscript/Manifest @@ -1,2 +1,2 @@ -DIST angelscript_2.35.1.zip 2033435 BLAKE2B b88189fb78294e5804adf313bc333a9a21760120a42b3df78c9c54861718acf435de55dcfb26a8975407102c1182093caed11bfecc6ba946bc7614f62f7e176a SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa DIST angelscript_2.36.0.zip 2038804 BLAKE2B 83d47ffb8563968d1db4955286ad5c4f7767132ddaa7420126ae3faa34f0b44fe319432324eb4fe3bd9317e79149719c6587cbafb28d061e37801f63be126a59 SHA512 afd2b9096d0b62bc3d182d684fe34ddc8e9520af7734eea1f1a5c7d3439a28a1be7502faf692080cb0c4591799b7fea09fc8c4ccf25b8ec63a3d306e678682ff +DIST angelscript_2.36.1.zip 2011471 BLAKE2B 81cd147b7e78abe9a8a342ca3c88191cf1eb0e50f78bcd8c1f2ab36e31eadc3260373159ea084cfe9140897df5187ac268d9624b5f8613564e1d6982b1178a54 SHA512 d6d213ce72135c89e47e67521f654611ff67673f3decd9db3da4b7bf317a04a3f91c5c6ae36658ec3f2b20498facd069af02a91255a24ec79c96d8c90d6b554e diff --git a/dev-libs/angelscript/angelscript-2.35.1-r1.ebuild b/dev-libs/angelscript/angelscript-2.36.1.ebuild index d0aa028768b9..e08cb09b96df 100644 --- a/dev-libs/angelscript/angelscript-2.35.1-r1.ebuild +++ b/dev-libs/angelscript/angelscript-2.36.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,16 +10,12 @@ HOMEPAGE="http://www.angelcode.com/angelscript/" SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip" LICENSE="ZLIB" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="doc static-libs" BDEPEND="app-arch/unzip" S="${WORKDIR}/sdk" -PATCHES=( - "${FILESDIR}/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch" - "${FILESDIR}/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch" -) pkg_setup() { tc-export CXX AR RANLIB diff --git a/dev-libs/angelscript/files/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch b/dev-libs/angelscript/files/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch deleted file mode 100644 index b889c495f3e6..000000000000 --- a/dev-libs/angelscript/files/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patch taken from Debian: -https://salsa.debian.org/yangfl-guest/angelscript/-/blob/master/debian/patches/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch - -Gentoo bug: -https://bugs.gentoo.org/818868 - -From 53841747c668abe3ff2cac280354703bef5dd395 Mon Sep 17 00:00:00 2001 -From: yangfl <yangfl@users.noreply.github.com> -Date: Thu, 14 Oct 2021 18:29:25 +0800 -Subject: [PATCH 4/6] Add as_callfunc_arm64.cpp to gnuc makefile - ---- - angelscript/projects/gnuc/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/angelscript/projects/gnuc/Makefile b/angelscript/projects/gnuc/Makefile -index 5274f05e..276baa9e 100644 ---- a/angelscript/projects/gnuc/Makefile -+++ b/angelscript/projects/gnuc/Makefile -@@ -107,6 +107,7 @@ SRCNAMES = \ - as_bytecode.cpp \ - as_callfunc.cpp \ - as_callfunc_arm.cpp \ -+ as_callfunc_arm64.cpp \ - as_callfunc_mips.cpp \ - as_callfunc_ppc.cpp \ - as_callfunc_ppc_64.cpp \ --- -2.33.0 - diff --git a/dev-libs/angelscript/files/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch b/dev-libs/angelscript/files/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch deleted file mode 100644 index ccdd21a5e7c9..000000000000 --- a/dev-libs/angelscript/files/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ -This file taken from Debian: -https://salsa.debian.org/yangfl-guest/angelscript/-/blob/master/debian/patches/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch - -Gentoo bug: -https://bugs.gentoo.org/818868 - -From 64e3e5a356047531012789802ece987bacb6a120 Mon Sep 17 00:00:00 2001 -From: yangfl <yangfl@users.noreply.github.com> -Date: Fri, 15 Oct 2021 02:24:17 +0800 -Subject: [PATCH 6/6] Add as_callfunc_arm_gcc.S to gnuc makefile - ---- - angelscript/projects/gnuc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/angelscript/projects/gnuc/Makefile b/angelscript/projects/gnuc/Makefile -index 276baa9e..973da7b0 100644 ---- a/angelscript/projects/gnuc/Makefile -+++ b/angelscript/projects/gnuc/Makefile -@@ -145,7 +145,7 @@ OBJ = $(addprefix $(OBJDIR)/, $(notdir $(SRCNAMES:.cpp=.o))) - ifeq ($(TARGETPLATFORM), iphone) - OBJ += $(OBJDIR)/as_callfunc_arm_xcode.o - else -- OBJ += $(OBJDIR)/as_callfunc_arm_gcc.o -+ OBJ += $(OBJDIR)/as_callfunc_arm_gcc.o $(OBJDIR)/as_callfunc_arm64_gcc.o - endif - - --- -2.33.0 - diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest index 62bc5186864f..553ca4d15de8 100644 --- a/dev-libs/apache-arrow/Manifest +++ b/dev-libs/apache-arrow/Manifest @@ -1,6 +1,12 @@ DIST apache-arrow-11.0.0.tar.gz 19956186 BLAKE2B dff0faecbde9e2d19f092fd0c48a7ac7a401da6dbfd17f30af1b35c9e3fd3e1ba5611311f5bcb08383368de195cff783a178a9397a63a1c4f740a81349f8b8d3 SHA512 46df4fb5a703d38d0a74fde9838e9f9702b24b442cb225517516c335a5ab18955699000bf0b2fc7d1698ada6d2e890ba3860933b6280f5160b0fce8a07484d0e DIST apache-arrow-12.0.0.tar.gz 20159048 BLAKE2B 43b4f36e1d1f84fc83c46a3627ad72cead38310f4325b8d21d17d726cd416016f0839d312c80737c0a921da6aefee537413e30309a656301c19834c2986d734e SHA512 f815be4fb20b6001ba5525270765fe239b5468708a7be34b93b60ee0ce63464727d183c9756fbc33bffd199019e1f06a7fddd306ce8388435cea7771070a2ca9 +DIST apache-arrow-12.0.1.tar.gz 20172604 BLAKE2B bf66761d33ceb778c2f53c2e643e0c2bb4448f29eaa94d17e9815628665f4965fde28bd47fce4a5874717d2161c3f8adbb2e8a0e6658a51ae6d617e4f09d202b SHA512 551ae200551fcc73b7deddcc5f0b06633159ab1308506901a9086e4e2e34e4437f26d609fdbacba0ebe7d1fe83bdb8e92a268e9e41575d655d5b2d4fbef7a7ce +DIST apache-arrow-14.0.1.tar.gz 20968461 BLAKE2B 01a4269f98ba2a4de1d6bc29f43a4e97132f8b7bdb3c3d022e0c0ba498527003e8bec0ea0b054f19ae54749f45fe39675f651f6c9e34e815df5a9b9926512431 SHA512 31d19f0ca80349f63db74bae813256b47907f85725a9bf01ef6f32406e79828ebb4701faedb52696b6a5b3bb89ad4e136485fd5eb35d396dd42147c11d4d2713 DIST apache-arrow-arrow-data-11.0.0.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82 DIST apache-arrow-arrow-data-12.0.0.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82 +DIST apache-arrow-arrow-data-12.0.1.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82 +DIST apache-arrow-arrow-data-14.0.1.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82 DIST apache-arrow-parquet-data-11.0.0.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61 DIST apache-arrow-parquet-data-12.0.0.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61 +DIST apache-arrow-parquet-data-12.0.1.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61 +DIST apache-arrow-parquet-data-14.0.1.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61 diff --git a/dev-libs/apache-arrow/apache-arrow-12.0.1-r1.ebuild b/dev-libs/apache-arrow/apache-arrow-12.0.1-r1.ebuild new file mode 100644 index 000000000000..d5fbf06edf70 --- /dev/null +++ b/dev-libs/apache-arrow/apache-arrow-12.0.1-r1.ebuild @@ -0,0 +1,121 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929 +PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac + +DESCRIPTION="A cross-language development platform for in-memory data." +HOMEPAGE="https://arrow.apache.org/" +SRC_URI=" + mirror://apache/arrow/arrow-${PV}/${P}.tar.gz + test? ( + https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz + -> ${PN}-parquet-data-${PV}.tar.gz + https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz + -> ${PN}-arrow-data-${PV}.tar.gz + ) +" +S="${WORKDIR}/${P}/cpp" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + brotli? ( app-arch/brotli:= ) + bzip2? ( app-arch/bzip2:= ) + compute? ( dev-libs/libutf8proc:= ) + dataset? ( + dev-libs/libutf8proc:= + re2? ( dev-libs/re2:= ) + ) + lz4? ( app-arch/lz4:= ) + parquet? ( + dev-libs/libutf8proc:= + dev-libs/thrift:= + ssl? ( dev-libs/openssl:= ) + ) + snappy? ( app-arch/snappy:= ) + zlib? ( sys-libs/zlib:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND} + dev-cpp/xsimd + >=dev-libs/boost-1.81.0 + json? ( dev-libs/rapidjson ) + test? ( + dev-cpp/gflags + dev-cpp/gtest + ) +" + +REQUIRED_USE=" + test? ( + json + parquet? ( zstd ) + ) + ssl? ( json ) +" + +PATCHES=( "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" ) + +src_prepare() { + # use Gentoo CXXFLAGS, specify docdir at src_configure. + sed -i \ + -e '/SetupCxxFlags/d' \ + -e '/set(ARROW_DOC_DIR.*)/d' \ + CMakeLists.txt \ + || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DARROW_BUILD_STATIC=OFF + -DARROW_BUILD_TESTS=$(usex test) + -DARROW_COMPUTE=$(usex compute) + -DARROW_CSV=ON + -DARROW_DATASET=$(usex dataset) + -DARROW_DEPENDENCY_SOURCE=SYSTEM + -DARROW_DOC_DIR=share/doc/${PF} + -DARROW_FILESYSTEM=ON + -DARROW_HDFS=ON + -DARROW_JEMALLOC=OFF + -DARROW_JSON=$(usex json) + -DARROW_PARQUET=$(usex parquet) + -DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl) + -DARROW_USE_CCACHE=OFF + -DARROW_USE_SCCACHE=OFF + -DARROW_WITH_BROTLI=$(usex brotli) + -DARROW_WITH_BZ2=$(usex bzip2) + -DARROW_WITH_LZ4=$(usex lz4) + -DARROW_WITH_RE2=$(usex re2) + -DARROW_WITH_SNAPPY=$(usex snappy) + -DARROW_WITH_ZLIB=$(usex zlib) + -DARROW_WITH_ZSTD=$(usex zstd) + -DCMAKE_CXX_STANDARD=17 + ) + cmake_src_configure +} + +src_test() { + export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data" + export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data" + cmake_src_test +} + +src_install() { + cmake_src_install + if use test; then + cd "${D}"/usr/$(get_libdir) + rm -r cmake/ArrowTesting || die + rm libarrow_testing* || die + rm pkgconfig/arrow-testing.pc || die + fi +} diff --git a/dev-libs/apache-arrow/apache-arrow-14.0.1.ebuild b/dev-libs/apache-arrow/apache-arrow-14.0.1.ebuild new file mode 100644 index 000000000000..1efaeb5c1772 --- /dev/null +++ b/dev-libs/apache-arrow/apache-arrow-14.0.1.ebuild @@ -0,0 +1,124 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929 +PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac + +DESCRIPTION="A cross-language development platform for in-memory data." +HOMEPAGE="https://arrow.apache.org/" +SRC_URI=" + mirror://apache/arrow/arrow-${PV}/${P}.tar.gz + test? ( + https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz + -> ${PN}-parquet-data-${PV}.tar.gz + https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz + -> ${PN}-arrow-data-${PV}.tar.gz + ) +" +S="${WORKDIR}/${P}/cpp" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + brotli? ( app-arch/brotli:= ) + bzip2? ( app-arch/bzip2:= ) + compute? ( dev-libs/libutf8proc:= ) + dataset? ( + dev-libs/libutf8proc:= + re2? ( dev-libs/re2:= ) + ) + lz4? ( app-arch/lz4:= ) + parquet? ( + dev-libs/libutf8proc:= + dev-libs/thrift:= + ssl? ( dev-libs/openssl:= ) + ) + snappy? ( app-arch/snappy:= ) + zlib? ( sys-libs/zlib:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND} + dev-cpp/xsimd + >=dev-libs/boost-1.81.0 + json? ( dev-libs/rapidjson ) + test? ( + dev-cpp/gflags + dev-cpp/gtest + ) +" + +REQUIRED_USE=" + test? ( + json + parquet? ( zstd ) + ) + ssl? ( json ) +" + +PATCHES=( + "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" + "${FILESDIR}"/${P}-gcc14.patch +) + +src_prepare() { + # use Gentoo CXXFLAGS, specify docdir at src_configure. + sed -i \ + -e '/SetupCxxFlags/d' \ + -e '/set(ARROW_DOC_DIR.*)/d' \ + CMakeLists.txt \ + || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DARROW_BUILD_STATIC=OFF + -DARROW_BUILD_TESTS=$(usex test) + -DARROW_COMPUTE=$(usex compute) + -DARROW_CSV=ON + -DARROW_DATASET=$(usex dataset) + -DARROW_DEPENDENCY_SOURCE=SYSTEM + -DARROW_DOC_DIR=share/doc/${PF} + -DARROW_FILESYSTEM=ON + -DARROW_HDFS=ON + -DARROW_JEMALLOC=OFF + -DARROW_JSON=$(usex json) + -DARROW_PARQUET=$(usex parquet) + -DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl) + -DARROW_USE_CCACHE=OFF + -DARROW_USE_SCCACHE=OFF + -DARROW_WITH_BROTLI=$(usex brotli) + -DARROW_WITH_BZ2=$(usex bzip2) + -DARROW_WITH_LZ4=$(usex lz4) + -DARROW_WITH_RE2=$(usex re2) + -DARROW_WITH_SNAPPY=$(usex snappy) + -DARROW_WITH_ZLIB=$(usex zlib) + -DARROW_WITH_ZSTD=$(usex zstd) + -DCMAKE_CXX_STANDARD=17 + ) + cmake_src_configure +} + +src_test() { + export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data" + export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data" + cmake_src_test +} + +src_install() { + cmake_src_install + if use test; then + cd "${D}"/usr/$(get_libdir) + rm -r cmake/ArrowTesting || die + rm libarrow_testing* || die + rm pkgconfig/arrow-testing.pc || die + fi +} diff --git a/dev-libs/apache-arrow/files/apache-arrow-14.0.1-gcc14.patch b/dev-libs/apache-arrow/files/apache-arrow-14.0.1-gcc14.patch new file mode 100644 index 000000000000..ccaf8cff0e98 --- /dev/null +++ b/dev-libs/apache-arrow/files/apache-arrow-14.0.1-gcc14.patch @@ -0,0 +1,10 @@ +--- a/src/arrow/filesystem/util_internal.cc 2023-11-23 17:13:03.062791581 +0100 ++++ b/src/arrow/filesystem/util_internal.cc 2023-11-23 17:13:22.441459075 +0100 +@@ -18,6 +18,7 @@ + #include "arrow/filesystem/util_internal.h" + + #include <cerrno> ++#include <algorithm> + + #include "arrow/buffer.h" + #include "arrow/filesystem/path_util.h" diff --git a/dev-libs/apache-arrow/metadata.xml b/dev-libs/apache-arrow/metadata.xml index ec76842d03f6..f3a30cdad7ac 100644 --- a/dev-libs/apache-arrow/metadata.xml +++ b/dev-libs/apache-arrow/metadata.xml @@ -6,7 +6,6 @@ <name>Tupone Alfredo</name> </maintainer> <use> - <flag name="brotli">Enable brotli compression support</flag> <flag name="compute">Build the Arrow Compute Modules</flag> <flag name="dataset">Build the Arrow Dataset Modules</flag> <flag name="json">Enables read/write json format</flag> diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index 2e213f107408..0cfafec657cc 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1 +1,2 @@ DIST AppStream-0.15.6.tar.xz 2517688 BLAKE2B 09519205c7dfc5f0715b9d5ae7e99a67673ab499f1e2cb39815edde64defc1aa5059215575278bbcfc4482cd385a79e081c70f6acea3c446c5869dc6b2e18f6c SHA512 7426bc89e22b751de7b3e27d7c07eb1c373f4439f9966868ce5ea410d209b8c5292e03695a34b7a49bfa61e2e62265c7f7cdffc0be871c950193c933f65757ef +DIST AppStream-0.16.4.tar.xz 2570176 BLAKE2B ac051b846fd1c7b0cbb3429e0b4c3f81027cddb35ee6bcd5e9d38a09d937abcc37ac4908f68ec55404ae852fd146b4e749832d3ac96443458e86cfe506a6fed4 SHA512 e3a9fc423fe5a2baaaa002871566f320ecd6dbd3a01ab24221afe9b93a69e9afb6bed6d7772c434376501803dc7b2c80b79eda849fcaf4748f9f24a5908a22a8 diff --git a/dev-libs/appstream/appstream-0.16.4.ebuild b/dev-libs/appstream/appstream-0.16.4.ebuild new file mode 100644 index 000000000000..431e2514157b --- /dev/null +++ b/dev-libs/appstream/appstream-0.16.4.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg-utils + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ximion/${PN}" +else + MY_PN="AppStream" + SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem" +HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/" + +LICENSE="LGPL-2.1+ GPL-2+" +# check as_api_level +SLOT="0/4" +IUSE="apt doc +introspection qt5 systemd test" +RESTRICT="test" # bug 691962 + +RDEPEND=" + >=dev-libs/glib-2.62:2 + dev-libs/libxml2:2 + >=dev-libs/libxmlb-0.3.14:= + dev-libs/libyaml + dev-libs/snowball-stemmer:= + >=net-misc/curl-7.62 + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) + qt5? ( dev-qt/qtcore:5 ) + systemd? ( sys-apps/systemd:= ) +" +DEPEND="${RDEPEND} + test? ( qt5? ( dev-qt/qttest:5 ) ) +" +BDEPEND=" + dev-libs/appstream-glib + dev-libs/libxslt + dev-util/itstool + >=sys-devel/gettext-0.19.8 + doc? ( app-text/docbook-xml-dtd:4.5 ) + test? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( "${FILESDIR}"/${P}-disable-Werror-flags.patch ) # bug 733774 + +src_prepare() { + default + sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die + if ! use test; then + sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944 + fi +} + +src_configure() { + xdg_environment_reset + + local emesonargs=( + -Dapidocs=false + -Ddocs=false + -Dcompose=false + -Dmaintainer=false + -Dstatic-analysis=false + -Dstemming=true + -Dvapi=false + -Dapt-support=$(usex apt true false) + -Dinstall-docs=$(usex doc true false) + -Dgir=$(usex introspection true false) + -Dqt=$(usex qt5 true false) + -Dsystemd=$(usex systemd true false) + ) + + meson_src_configure +} diff --git a/dev-libs/appstream/files/appstream-0.16.4-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.16.4-disable-Werror-flags.patch new file mode 100644 index 000000000000..e42c88e3bd31 --- /dev/null +++ b/dev-libs/appstream/files/appstream-0.16.4-disable-Werror-flags.patch @@ -0,0 +1,50 @@ +--- a/meson.build 2023-03-15 14:18:16.657101983 -0700 ++++ b/meson.build 2023-03-15 14:21:20.055049626 -0700 +@@ -97,47 +97,6 @@ + endif + endif + +-# a few compiler warning flags we always want enabled +-add_project_arguments( +- cc.get_supported_arguments([ +- '-Werror=shadow', +- '-Werror=empty-body', +- '-Werror=strict-prototypes', +- '-Werror=missing-prototypes', +- '-Werror=implicit-function-declaration', +- '-Werror=pointer-arith', +- '-Werror=missing-declarations', +- '-Werror=return-type', +- '-Werror=int-conversion', +- '-Werror=incompatible-pointer-types', +- '-Werror=misleading-indentation', +- '-Werror=missing-include-dirs', +- '-Werror=declaration-after-statement', +- '-Werror=format-security', +- +- '-Wno-missing-field-initializers', +- '-Wno-error=missing-field-initializers', +- '-Wno-unused-parameter', +- '-Wno-error=unused-parameter', +- ]), +- language: 'c' +-) +-add_project_arguments( +- '-Wno-unused-parameter', +- '-Werror=shadow', +- '-Werror=empty-body', +- '-Werror=pointer-arith', +- '-Werror=init-self', +- '-Werror=missing-declarations', +- '-Werror=return-type', +- '-Werror=misleading-indentation', +- '-Werror=format-security', +- +- # NOTE: Can be removed with AppStream 1.0 +- '-Wno-error=c++20-compat', +- language: 'cpp' +-) +- + # Vendor extensions in system headers + add_project_arguments('-D_POSIX_C_SOURCE=200809L', language: 'c') + diff --git a/dev-libs/apr-util/apr-util-1.6.3.ebuild b/dev-libs/apr-util/apr-util-1.6.3.ebuild index a89798ba780f..3645b9fdae6b 100644 --- a/dev-libs/apr-util/apr-util-1.6.3.ebuild +++ b/dev-libs/apr-util/apr-util-1.6.3.ebuild @@ -51,6 +51,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.1-my_bool.patch "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch "${FILESDIR}"/${PN}-1.6.3-fix-pkgconfig-libs.patch + "${FILESDIR}"/${PN}-1.6.3-configure-int.patch ) src_prepare() { diff --git a/dev-libs/apr-util/files/apr-util-1.6.3-configure-int.patch b/dev-libs/apr-util/files/apr-util-1.6.3-configure-int.patch new file mode 100644 index 000000000000..fd394adbe309 --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.6.3-configure-int.patch @@ -0,0 +1,28 @@ +commit 4286faefa6fe9ee83e30bacd4e4c498981ac92b7 +Author: jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> +Date: Fri Feb 3 16:36:17 2023 +0000 + + Merge r1906347 from trunk: + + Fix configure for compilers which don't accept implicit + int (no longer part of C since C99). + + Submitted by: Florian Weimer <fweimer redhat.com> + PR: 66396 + + + git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.6.x@1907246 13f79535-47bb-0310-9956-ffa450edef68 + +diff --git a/build/dbm.m4 b/build/dbm.m4 +index 57bd131..e8c51b5 100644 +--- a/build/dbm.m4 ++++ b/build/dbm.m4 +@@ -235,7 +235,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB], + #include <stdlib.h> + #include <stdio.h> + #include <$apu_try_berkeley_db_header> +-main () ++int main (void) + { + int major, minor, patch; + diff --git a/dev-libs/apr/apr-1.7.4-r1.ebuild b/dev-libs/apr/apr-1.7.4-r1.ebuild new file mode 100644 index 000000000000..b422544bfc7c --- /dev/null +++ b/dev-libs/apr/apr-1.7.4-r1.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Apache Portable Runtime Library" +HOMEPAGE="https://apr.apache.org/" +SRC_URI="mirror://apache/apr/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="1/${PV%.*}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc old-kernel selinux static-libs +urandom valgrind" + +# See bug #815265 for libcrypt dependency +DEPEND=" + virtual/libcrypt:= + elibc_glibc? ( >=sys-apps/util-linux-2.16 ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-base-policy ) +" +DEPEND+=" valgrind? ( dev-util/valgrind )" +BDEPEND=" + >=sys-devel/libtool-2.4.2 + doc? ( app-doc/doxygen ) +" + +DOCS=( CHANGES NOTICE README ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch + "${FILESDIR}"/${PN}-1.7.2-libtool.patch + "${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775 + "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch + "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch + "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch + "${FILESDIR}"/config.layout.patch +) + +src_prepare() { + default + + mv configure.in configure.ac || die + AT_M4DIR="build" eautoreconf +} + +src_configure() { + tc-export AS CC CPP + + local myconf=( + --enable-layout=gentoo + --enable-nonportable-atomics + --enable-posix-shm + --enable-threads + $(use_enable static-libs static) + $(use_with valgrind) + --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build + ) + + tc-is-static-only && myconf+=( --disable-dso ) + + if use old-kernel; then + local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec + export apr_cv_accept4="no" + export apr_cv_dup3="no" + export apr_cv_epoll_create1="no" + export apr_cv_sock_cloexec="no" + fi + + if tc-is-cross-compiler; then + # The apache project relies heavily on AC_TRY_RUN and doesn't + # have any sane cross-compiling fallback logic. + export \ + ac_cv_file__dev_zero="yes" \ + ac_cv_func_sem_open="yes" \ + ac_cv_mmap__dev_zero="yes" \ + ac_cv_negative_eai="yes" \ + ac_cv_o_nonblock_inherited="no" \ + ac_cv_struct_rlimit="yes" \ + ap_cv_atomic_builtins="yes" \ + apr_cv_accept4="yes" \ + apr_cv_dup3="yes" \ + apr_cv_epoll="yes" \ + apr_cv_epoll_create1="yes" \ + apr_cv_gai_addrconfig="yes" \ + apr_cv_mutex_recursive="yes" \ + apr_cv_mutex_robust_shared="yes" \ + apr_cv_process_shared_works="yes" \ + apr_cv_pthreads_lib="-pthread" \ + apr_cv_sock_cloexec="yes" \ + apr_cv_tcp_nodelay_with_cork="yes" + fi + + if use urandom; then + myconf+=( --with-devrandom=/dev/urandom ) + else + myconf+=( --with-devrandom=/dev/random ) + fi + + # Avoid libapr containing undefined references (underlinked) + # undefined reference to `__sync_val_compare_and_swap_8' + # (May be possible to fix via libatomic linkage in future?) + # bug #740464 + append-atomic-flags + if [[ ${LIBS} == *atomic* ]] ; then + myconf+=( --disable-nonportable-atomics ) + fi + + econf "${myconf[@]}" +} + +src_compile() { + if tc-is-cross-compiler; then + # This header is the same across targets, so use the build compiler. + emake tools/gen_test_char + + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ + tools/gen_test_char.c -o tools/gen_test_char || die + fi + + emake all $(usev doc dox) +} + +src_test() { + # Building tests in parallel is broken + emake -j1 check +} + +src_install() { + default + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi + + if use doc; then + docinto html + dodoc -r docs/dox/html/* + fi + + # This file is only used on AIX systems, which Gentoo is not, + # and causes collisions between the SLOTs, so remove it. + # Even in Prefix, we don't need this on AIX. + rm "${ED}/usr/$(get_libdir)/apr.exp" || die +} diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild index e2253cffa218..7a36f8629dcf 100644 --- a/dev-libs/apr/apr-1.7.4.ebuild +++ b/dev-libs/apr/apr-1.7.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1/${PV%.*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc old-kernel selinux static-libs +urandom valgrind" # See bug #815265 for libcrypt dependency diff --git a/dev-libs/argtable/argtable-2.13-r4.ebuild b/dev-libs/argtable/argtable-2.13-r4.ebuild index f5b108d4161e..2c18502ad2c2 100644 --- a/dev-libs/argtable/argtable-2.13-r4.ebuild +++ b/dev-libs/argtable/argtable-2.13-r4.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="doc debug examples static-libs" PATCHES=( diff --git a/dev-libs/asmjit/asmjit-2021.11.13.ebuild b/dev-libs/asmjit/asmjit-2021.11.13.ebuild index 95281b54c698..f16e753bac6e 100644 --- a/dev-libs/asmjit/asmjit-2021.11.13.ebuild +++ b/dev-libs/asmjit/asmjit-2021.11.13.ebuild @@ -15,8 +15,6 @@ SLOT="0" KEYWORDS="~amd64" IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" diff --git a/dev-libs/asmjit/asmjit-2022.07.02.ebuild b/dev-libs/asmjit/asmjit-2022.07.02.ebuild index a436e9b2a3f1..23065a9bf113 100644 --- a/dev-libs/asmjit/asmjit-2022.07.02.ebuild +++ b/dev-libs/asmjit/asmjit-2022.07.02.ebuild @@ -15,8 +15,6 @@ SLOT="0" KEYWORDS="~amd64" IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild index 1b4a2cfbb68e..41598a235fdd 100644 --- a/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild +++ b/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild @@ -15,7 +15,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" RDEPEND=" >=dev-libs/glib-2.58:2 diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest index 51ec77857437..b504018a63b4 100644 --- a/dev-libs/bemenu/Manifest +++ b/dev-libs/bemenu/Manifest @@ -1,3 +1,4 @@ DIST bemenu-0.6.10.tar.gz 129568 BLAKE2B f81e84e6457175abf11b9dc6c426cb02121b4f101bdef55361c539f6d51144539129d2e2898e506c12f32d8f45a27fb0159083b5b964b33a0fc73485ebe41b00 SHA512 b8aadbe2cd11f7cc713ce683fcc9ce4779cd0050ee8cf41c4d3bca9f299ac99b9cd3b7611d87d27d7f7439f16fc2618671f2bec8878ad2ab65fade54f24ca92f DIST bemenu-0.6.14.tar.gz 133229 BLAKE2B 6e83143f7cf808002d6f74b37922b96232c13b884b07c1901e483fd4263db2047394914d8bfe5292907e8a89674d9eed7966722cac4deeac36e5c39ada6eab75 SHA512 8d4fabc962e7d2b6ad23012d172292f74e46d3af68f070222e55a748e4b7a14c42f30f78acad14f5bb73abfa6b7932aff25c24b346908ce780ea00f577a848d9 DIST bemenu-0.6.15.tar.gz 134318 BLAKE2B 0739f3bdf5ad7bcc5b5e75577848965b848df8c8c407d574fcad81fe437d14ade11cc86a81bb2ea5b13faac1a035911f7590013ffbbb7366935c33d171fbf479 SHA512 2de6967ce337b37c943585e3aad0efa1cc7161b0f9666298e0e1f2570f13f3c0b9edef1ab80346e906cd8f53056a7b1a019de7240d2766584031d7b8d76276ab +DIST bemenu-0.6.16.tar.gz 135025 BLAKE2B 3a6d131606f22357ce48fbe1946fc3e3be920b52e271db37bae4282ec0ee6614262356821568579112c8e2aa1f5dd147f914183a556a06993a862f14ff3acdcb SHA512 b98a5ad4ec60063b800dd122eb07d3a876e52420abd5827d1421b2e956671d6e7be04e97693da39bcc3b40eaecec46ea6103eeaf2885deea96703218182493b5 diff --git a/dev-libs/bemenu/bemenu-0.6.16.ebuild b/dev-libs/bemenu/bemenu-0.6.16.ebuild new file mode 100644 index 000000000000..590d8a37de99 --- /dev/null +++ b/dev-libs/bemenu/bemenu-0.6.16.ebuild @@ -0,0 +1,62 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="dmenu clone for wayland" +HOMEPAGE="https://github.com/Cloudef/bemenu" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git" +else + SRC_URI="https://github.com/Cloudef/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="doc ncurses wayland X" + +# Require at least one backend be built +REQUIRED_USE="|| ( ncurses wayland X )" + +RDEPEND=" + ncurses? ( sys-libs/ncurses:= ) + wayland? ( + dev-libs/wayland + x11-libs/cairo + x11-libs/libxkbcommon + x11-libs/pango + ) + X? ( + x11-libs/cairo[X] + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libxcb:= + x11-libs/pango[X] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/scdoc + virtual/pkgconfig + doc? ( app-doc/doxygen ) + wayland? ( + dev-libs/wayland-protocols + dev-util/wayland-scanner + ) +" + +src_compile() { + tc-export CC + + emake clients $(usev ncurses curses) $(usev X x11) $(usev wayland) PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) + use doc && emake doxygen PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) +} + +src_install() { + emake install DESTDIR="${D}" PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) +} diff --git a/dev-libs/bemenu/bemenu-9999.ebuild b/dev-libs/bemenu/bemenu-9999.ebuild index 74a5e8c07a56..590d8a37de99 100644 --- a/dev-libs/bemenu/bemenu-9999.ebuild +++ b/dev-libs/bemenu/bemenu-9999.ebuild @@ -27,36 +27,36 @@ RDEPEND=" wayland? ( dev-libs/wayland x11-libs/cairo + x11-libs/libxkbcommon x11-libs/pango - x11-libs/libxcb ) X? ( - x11-libs/libxcb - x11-libs/libXext - x11-libs/libX11 x11-libs/cairo[X] - x11-libs/pango[X] + x11-libs/libX11 + x11-libs/libXext x11-libs/libXinerama + x11-libs/libxcb:= + x11-libs/pango[X] ) " -DEPEND=" - ${RDEPEND} - wayland? ( - dev-libs/wayland-protocols - ) -" +DEPEND="${RDEPEND}" BDEPEND=" app-text/scdoc + virtual/pkgconfig doc? ( app-doc/doxygen ) + wayland? ( + dev-libs/wayland-protocols + dev-util/wayland-scanner + ) " src_compile() { tc-export CC - emake clients $(usex ncurses curses "") $(usex X x11 "") $(usex wayland wayland "") PREFIX=/usr libdir=/$(get_libdir) - use doc && emake doxygen PREFIX=/usr libdir=/$(get_libdir) + emake clients $(usev ncurses curses) $(usev X x11) $(usev wayland) PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) + use doc && emake doxygen PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) } src_install() { - emake install PREFIX="${D}"/usr libdir=/$(get_libdir) + emake install DESTDIR="${D}" PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) } diff --git a/dev-libs/blake3/Manifest b/dev-libs/blake3/Manifest new file mode 100644 index 000000000000..cab775f96d36 --- /dev/null +++ b/dev-libs/blake3/Manifest @@ -0,0 +1,2 @@ +DIST blake3-1.4.1.tar.gz 224891 BLAKE2B c5d20f40ee2c4c35dfa89de8318e246baef2feab23d71e6c73da201c726ea51b42bec2a5769660a18298057591f479a62b29150f91f07b37eed3438f1a78bec1 SHA512 d21025764fb9ae020561ce2301156a69a77c89a4c5e402a27095e5014159d1a8fee340ff1b1db00b5b22f7a9a4d38273132aab13ca5bd639944492f1b31c9ec1 +DIST blake3-1.5.0.tar.gz 228053 BLAKE2B 04405b0bea5e0a5a774c84e712f36c61fd695c4cbe203a327741db7138af38fc4deda7c75a149f1850a1ca01a519897fb8e84c2cbe38f9cc084357c5ed61a1ed SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0 diff --git a/dev-libs/blake3/blake3-1.4.1.ebuild b/dev-libs/blake3/blake3-1.4.1.ebuild new file mode 100644 index 000000000000..2bc612e7279e --- /dev/null +++ b/dev-libs/blake3/blake3-1.4.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="a fast cryptographic hash function" +HOMEPAGE="https://github.com/BLAKE3-team/BLAKE3" +SRC_URI="https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/BLAKE3-${PV}/c" + +LICENSE="|| ( CC0-1.0 Apache-2.0 )" +SLOT="0/0" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-libs/blake3/blake3-1.5.0.ebuild b/dev-libs/blake3/blake3-1.5.0.ebuild new file mode 100644 index 000000000000..056f19905d76 --- /dev/null +++ b/dev-libs/blake3/blake3-1.5.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="a fast cryptographic hash function" +HOMEPAGE="https://github.com/BLAKE3-team/BLAKE3" +SRC_URI="https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/BLAKE3-${PV}/c" + +LICENSE="|| ( CC0-1.0 Apache-2.0 )" +SLOT="0/0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-libs/libchdr/metadata.xml b/dev-libs/blake3/metadata.xml index 52316d51b131..9bc26a88114e 100644 --- a/dev-libs/libchdr/metadata.xml +++ b/dev-libs/blake3/metadata.xml @@ -2,10 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>ionen@gentoo.org</email> - <name>Ionen Wolkens</name> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> </maintainer> <upstream> - <remote-id type="github">rtissera/libchdr</remote-id> + <remote-id type="github">BLAKE3-team/BLAKE3</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild index 38f972105da2..df450bbfd675 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild @@ -17,7 +17,7 @@ LICENSE="boehm-gc" # We've been using subslot 0 for these instead of "1.1". SLOT="0" # Upstream marked this version as "Pre-release" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cxx +large static-libs +threads" RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 4c89701f991c..44f190ebd9c5 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1,2 +1,2 @@ -DIST boost_1_81_0.tar.bz2 118797750 BLAKE2B ae57247fb80ee5a952881a99bdbe9a1d5622690879ef59053716647dc1121e70fdd322251837387b43357f1cd63c6d1ba285cf35c0c40e4f5ee28a929d7eacf7 SHA512 a04201e73da59f68fa02761b333c864a96ebaf268247b6b10cb19ed3d70ee9ad3da4c53123f2a7a4a9b9e1408793b51e1adbcc6fd09f60fecef3ca9522bb6b36 DIST boost_1_82_0.tar.bz2 121325129 BLAKE2B 16ee164ce7114d8134c861b3652c842750cec63ab0e79e4386d8cb9c56f7a454f9a9cfa75f25d9132a8d8d9e6f39d32a8e7535f83f52f355bbc40ef530163fa5 SHA512 6fddc452ca67f99f5c181e21c73d96feb7346e10886477c91b4abc2cdf447750599e0d42f935ef591222200ef6c033de078a7ad2bb577c81fa56a249b17420cb +DIST boost_1_83_0.tar.bz2 122892751 BLAKE2B c4af1713712da82f964fe08451141ea96905e30b475ee5090bf87ae6e43bcb1f258ab92e16e992fd22405e8cd85a435cef76a22b98788d9960396a4fec8c4c62 SHA512 d133b521bd754dc35a9bd30d8032bd2fd866026d90af2179e43bfd7bd816841f7f3b84303f52c0e54aebc373f4e4edd601a8f5a5e0c47500e0e852e04198a711 diff --git a/dev-libs/boost/boost-1.82.0-r1.ebuild b/dev-libs/boost/boost-1.82.0-r1.ebuild index 9ff7eebea25c..8a63f6519da2 100644 --- a/dev-libs/boost/boost-1.82.0-r1.ebuild +++ b/dev-libs/boost/boost-1.82.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # the tests will never fail because these are not intended as sanity diff --git a/dev-libs/boost/boost-1.81.0-r1.ebuild b/dev-libs/boost/boost-1.83.0-r1.ebuild index 4df537727e02..939e9e431ee5 100644 --- a/dev-libs/boost/boost-1.81.0-r1.ebuild +++ b/dev-libs/boost/boost-1.83.0-r1.ebuild @@ -3,7 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +# Keep an eye on both of these after releases for patches: +# * https://www.boost.org/patches/ +# * https://www.boost.org/users/history/version_${MY_PV}.html +# (e.g. https://www.boost.org/users/history/version_1_83_0.html) +# Note that the latter may sometimes feature patches not on the former too. + +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal @@ -16,8 +22,8 @@ S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="bzip2 +context debug doc icu lzma +nls mpi numpy python +stacktrace tools zlib zstd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # the tests will never fail because these are not intended as sanity # tests at all. They are more a way for upstream to check their own code @@ -27,7 +33,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="test" RDEPEND=" - !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) @@ -48,10 +53,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch # Boost.MPI's __init__.py doesn't work on Py3 "${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch - "${FILESDIR}"/${PN}-1.80.0-fix-mips1-transition.patch "${FILESDIR}"/${PN}-1.81.0-phoenix-multiple-definitions.patch - - # (upstreamed) ) python_bindings_needed() { @@ -72,20 +74,15 @@ create_user-config.jam() { fi local compiler compiler_version compiler_executable="$(tc-getCXX)" - if [[ ${CHOST} == *-darwin* ]]; then - compiler="darwin" - compiler_version="$(gcc-fullversion)" - else - compiler="gcc" - compiler_version="$(gcc-version)" - fi + compiler="gcc" + compiler_version="$(gcc-version)" if use mpi; then local mpi_configuration="using mpi ;" fi cat > "${user_config_jam}" <<- __EOF__ || die - using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ; + using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CPPFLAGS} ${CFLAGS}" <cxxflags>"${CPPFLAGS} ${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ; ${mpi_configuration} __EOF__ @@ -171,7 +168,7 @@ src_configure() { $(usev !mpi --without-mpi) $(usev !nls --without-locale) $(usev !context '--without-context --without-coroutine --without-fiber') - --without-stacktrace + $(usev !stacktrace --without-stacktrace) --boost-build="${BROOT}"/usr/share/b2/src --layout=system # building with threading=single is currently not possible @@ -194,6 +191,16 @@ src_configure() { # Use C++17 globally as of 1.80 append-cxxflags -std=c++17 + + if [[ ${CHOST} != *-darwin* ]]; then + # On modern macOS, file I/O is already 64-bit by default, + # there's no support for special options like O_LARGEFILE. + # Thus, LFS must be disabled. + # + # On other systems, we need to enable LFS explicitly for 64-bit + # offsets on 32-bit hosts (#894564) + append-lfs-flags + fi } multilib_src_compile() { @@ -240,16 +247,24 @@ multilib_src_install() { install_name_tool -id "/${d#${D}}" "${d}" eend $? # fix references to other libs + # these paths look like this: + # bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/ + # threadapi-pthread/threading-multi/visibility-hidden/ + # libboost_thread.dylib refs=$(otool -XL "${d}" | \ sed -e '1d' -e 's/^\t//' | \ - grep "^libboost_" | \ + grep "libboost_" | \ cut -f1 -d' ') local r for r in ${refs}; do - ebegin " correcting reference to ${r}" + # strip path prefix from references, so we obtain + # something like libboost_thread.dylib. + local r_basename=${r##*/} + + ebegin " correcting reference to ${r_basename}" install_name_tool -change \ "${r}" \ - "${EPREFIX}/usr/lib/${r}" \ + "${EPREFIX}/usr/lib/${r_basename}" \ "${d}" eend $? done diff --git a/dev-libs/boost/boost-1.83.0-r2.ebuild b/dev-libs/boost/boost-1.83.0-r2.ebuild new file mode 100644 index 000000000000..5f671e7f2cd5 --- /dev/null +++ b/dev-libs/boost/boost-1.83.0-r2.ebuild @@ -0,0 +1,357 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Keep an eye on both of these after releases for patches: +# * https://www.boost.org/patches/ +# * https://www.boost.org/users/history/version_${MY_PV}.html +# (e.g. https://www.boost.org/users/history/version_1_83_0.html) +# Note that the latter may sometimes feature patches not on the former too. + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal + +MY_PV="$(ver_rs 1- _)" + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="https://www.boost.org/" +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +S="${WORKDIR}/${PN}_${MY_PV}" + +LICENSE="Boost-1.0" +SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="bzip2 +context debug doc icu lzma +nls mpi numpy python +stacktrace tools zlib zstd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# the tests will never fail because these are not intended as sanity +# tests at all. They are more a way for upstream to check their own code +# on new compilers. Since they would either be completely unreliable +# (failing for no good reason) or completely useless (never failing) +# there is no point in having them in the ebuild to begin with. +RESTRICT="test" + +RDEPEND=" + bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) + icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) + !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) + mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) + python? ( + ${PYTHON_DEPS} + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ) + zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/b2-4.9.2" + +PATCHES=( + "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch + "${FILESDIR}"/${PN}-1.79.0-context-x32.patch + "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch + # Boost.MPI's __init__.py doesn't work on Py3 + "${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch + "${FILESDIR}"/${PN}-1.81.0-phoenix-multiple-definitions.patch + "${FILESDIR}"/${PN}-1.83.0-unordered-uaf.patch +) + +python_bindings_needed() { + multilib_is_native_abi && use python +} + +tools_needed() { + multilib_is_native_abi && use tools +} + +create_user-config.jam() { + local user_config_jam="${BUILD_DIR}"/user-config.jam + if [[ -s ${user_config_jam} ]]; then + einfo "${user_config_jam} already exists, skipping configuration" + return + else + einfo "Creating configuration in ${user_config_jam}" + fi + + local compiler compiler_version compiler_executable="$(tc-getCXX)" + compiler="gcc" + compiler_version="$(gcc-version)" + + if use mpi; then + local mpi_configuration="using mpi ;" + fi + + cat > "${user_config_jam}" <<- __EOF__ || die + using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CPPFLAGS} ${CFLAGS}" <cxxflags>"${CPPFLAGS} ${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ; + ${mpi_configuration} + __EOF__ + + if python_bindings_needed; then + append_to_user_config() { + local py_config + if tc-is-cross-compiler; then + py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" + else + py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" + fi + echo "${py_config}" >> "${user_config_jam}" || die + } + python_foreach_impl append_to_user_config + fi + + if python_bindings_needed && use numpy; then + einfo "Enabling support for NumPy extensions in Boost.Python" + else + einfo "Disabling support for NumPy extensions in Boost.Python" + + # Boost.Build does not allow for disabling of numpy + # extensions, thereby leading to automagic numpy + # https://github.com/boostorg/python/issues/111#issuecomment-280447482 + sed \ + -e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \ + -i "${BUILD_DIR}"/libs/python/build/Jamfile || die + fi +} + +pkg_setup() { + # Bail out on unsupported build configuration, bug #456792 + if [[ -f "${EROOT}"/etc/site-config.jam ]]; then + if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then + eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." + eerror "Boost can not be built in such configuration." + eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." + die "Unsupported target in ${EROOT}/etc/site-config.jam" + fi + fi +} + +src_prepare() { + default + multilib_copy_sources +} + +ejam() { + create_user-config.jam + + local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) + if python_bindings_needed; then + append_to_b2_opts() { + b2_opts+=( python="${EPYTHON#python}" ) + } + python_foreach_impl append_to_b2_opts + else + b2_opts+=( --without-python ) + fi + b2_opts+=( "$@" ) + + echo b2 "${b2_opts[@]}" >&2 + b2 "${b2_opts[@]}" +} + +src_configure() { + # Workaround for too many parallel processes requested, bug #506064 + [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" + + # We don't want to end up with -L/usr/lib on our linker lines + # which then gives us lots of + # skipping incompatible /usr/lib/libc.a when searching for -lc + # warnings + [[ -n ${ESYSROOT} ]] && local icuarg="-sICU_PATH=${ESYSROOT}/usr" + + OPTIONS=( + $(usex debug gentoodebug gentoorelease) + "-j$(makeopts_jobs)" + -q + -d+2 + pch=off + $(usex icu "${icuarg}" '--disable-icu boost.locale.icu=off') + $(usev !mpi --without-mpi) + $(usev !nls --without-locale) + $(usev !context '--without-context --without-coroutine --without-fiber') + $(usev !stacktrace --without-stacktrace) + --boost-build="${BROOT}"/usr/share/b2/src + --layout=system + # building with threading=single is currently not possible + # https://svn.boost.org/trac/boost/ticket/7105 + threading=multi + link=shared + # this seems to be the only way to disable compression algorithms + # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build + -sNO_BZIP2=$(usex bzip2 0 1) + -sNO_LZMA=$(usex lzma 0 1) + -sNO_ZLIB=$(usex zlib 0 1) + -sNO_ZSTD=$(usex zstd 0 1) + ) + + if [[ ${CHOST} == *-darwin* ]]; then + # We need to add the prefix, and in two cases this exceeds, so prepare + # for the largest possible space allocation. + append-ldflags -Wl,-headerpad_max_install_names + fi + + # Use C++17 globally as of 1.80 + append-cxxflags -std=c++17 + + if [[ ${CHOST} != *-darwin* ]]; then + # On modern macOS, file I/O is already 64-bit by default, + # there's no support for special options like O_LARGEFILE. + # Thus, LFS must be disabled. + # + # On other systems, we need to enable LFS explicitly for 64-bit + # offsets on 32-bit hosts (#894564) + append-lfs-flags + fi +} + +multilib_src_compile() { + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" || die + + if tools_needed; then + pushd tools >/dev/null || die + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" \ + || die "Building of Boost tools failed" + popd >/dev/null || die + fi +} + +multilib_src_install() { + ejam \ + --prefix="${ED}"/usr \ + --includedir="${ED}"/usr/include \ + --libdir="${ED}"/usr/$(get_libdir) \ + "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" + + if tools_needed; then + dobin dist/bin/* + + insinto /usr/share + doins -r dist/share/boostbook + fi + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + if [[ ${CHOST} == *-darwin* ]]; then + einfo "Working around completely broken build-system(tm)" + local d + for d in "${ED}"/usr/lib/*.dylib; do + if [[ -f ${d} ]]; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + # these paths look like this: + # bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/ + # threadapi-pthread/threading-multi/visibility-hidden/ + # libboost_thread.dylib + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + # strip path prefix from references, so we obtain + # something like libboost_thread.dylib. + local r_basename=${r##*/} + + ebegin " correcting reference to ${r_basename}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r_basename}" \ + "${d}" + eend $? + done + fi + done + fi +} + +multilib_src_install_all() { + if ! use numpy; then + rm -r "${ED}"/usr/include/boost/python/numpy* || die + fi + + if use python; then + if use mpi; then + move_mpi_py_into_sitedir() { + python_moduleinto boost + python_domodule "${S}"/libs/mpi/build/__init__.py + + python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so + rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die + + python_optimize + } + python_foreach_impl move_mpi_py_into_sitedir + else + rm -r "${ED}"/usr/include/boost/mpi/python* || die + fi + else + rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die + fi + + if ! use nls; then + rm -r "${ED}"/usr/include/boost/locale || die + fi + + if ! use context; then + rm -r "${ED}"/usr/include/boost/context || die + rm -r "${ED}"/usr/include/boost/coroutine{,2} || die + rm "${ED}"/usr/include/boost/asio/spawn.hpp || die + fi + + if use doc; then + # find extraneous files that shouldn't be installed + # as part of the documentation and remove them. + find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die + find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die + find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die + + docinto html + dodoc *.{htm,html,png,css} + dodoc -r doc libs more tools + + # To avoid broken links + dodoc LICENSE_1_0.txt + + dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost + fi +} + +pkg_preinst() { + # Yay for having symlinks that are nigh-impossible to remove without + # resorting to dirty hacks like these. Removes lingering symlinks + # from the slotted versions. + local symlink + for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do + if [[ -L ${symlink} ]]; then + rm -f "${symlink}" || die + fi + done + + # some ancient installs still have boost cruft lying around + # for unknown reasons, causing havoc for reverse dependencies + # Bug: 607734 + rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die +} + +pkg_postinst() { + elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" + elog + elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" + elog " <char>::transform_primary[abi:cxx11](char const*, char const*) const'" + elog + elog "Then you need to recompile Boost and all its reverse dependencies" + elog "using the same toolchain. In general, *every* change of the C++ toolchain" + elog "requires a complete rebuild of the Boost-dependent ecosystem." + elog + elog "See for instance https://bugs.gentoo.org/638138" +} diff --git a/dev-libs/boost/files/boost-1.83.0-unordered-uaf.patch b/dev-libs/boost/files/boost-1.83.0-unordered-uaf.patch new file mode 100644 index 000000000000..f9ecf675fd96 --- /dev/null +++ b/dev-libs/boost/files/boost-1.83.0-unordered-uaf.patch @@ -0,0 +1,18 @@ +https://www.boost.org/patches/1_83_0/0001-unordered-fix-copy-assign.patch +https://github.com/boostorg/unordered/issues/205 + +--- a/boost/unordered/detail/foa/core.hpp ++++ b/boost/unordered/detail/foa/core.hpp +@@ -1870,9 +1870,10 @@ private: + + void fast_copy_elements_from(const table_core& x) + { +- if(arrays.elements){ ++ if(arrays.elements&&x.arrays.elements){ + copy_elements_array_from(x); + copy_groups_array_from(x); ++ size_ctrl.ml=std::size_t(x.size_ctrl.ml); + size_ctrl.size=std::size_t(x.size_ctrl.size); + } + } + diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml index 98eea6f8a059..ba1a98dcc43b 100644 --- a/dev-libs/boost/metadata.xml +++ b/dev-libs/boost/metadata.xml @@ -15,6 +15,7 @@ <flag name="doc">Install the full API documentation documentation. This takes over 200MB of extra disk space.</flag> <flag name="nls">Build libboost_locale. This library requires compatible C library interfaces, which might not be provided by uClibc or other embedded libraries.</flag> <flag name="numpy">Optionally build NumPy extensions when Boost.Python is enabled</flag> + <flag name="stacktrace">Build the full Boost.Stacktrace dynamic library instead of relying on the header-only implementation</flag> <flag name="tools">Build and install the boost tools (bcp, quickbook, inspect, wave)</flag> </use> <upstream> diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index f1e5e9e25a16..e4e733e8a5fa 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,6 +1,6 @@ -DIST Botan-2.19.2.tar.xz 6063336 BLAKE2B a46fa49c61846e718197ab3a8431a5bdcab0f4cc5e42aec04fd22932ecdbfa2b755cae53c125eee8248ecae237671ec6f0533f99289068ed81e6cd34886d8b88 SHA512 52b9c80a240457e46a299480338472f7d0c0b56df7b1709fdef52c5be3afca5b474fe143801c9a332ae884eaf033e60461c9d3e0b2f7b069f4fe8b4c45932abf -DIST Botan-2.19.2.tar.xz.asc 488 BLAKE2B 94d22dff9de02871560649b1d961f4c7ae5fa37a847141554f8da9f0a726d4497cd23e0d84197beb4d176f29aa3a478118d94cd52d2c04733d115828f85d400d SHA512 e25a03ac437a08737ecde541ead4b841ccb507d3198683a1755dab1d4f82e9ce0278473db7c7041a4b808f9dff9927106e30bbad79b1674615254ee78f0b6a06 DIST Botan-2.19.3.tar.xz 6105896 BLAKE2B 6d7778d9e9a101c76f35c65b0fb0201641cd91967ba934510f3836ee4b924d54cabdc760dd460997679250aa66e1d2a99369cd03f8fb9e7b2fe672d4b355215f SHA512 80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110 DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B cd86bf77306aad2956cced6ac4fb96081279af88743e87d8fe5437e72e9fa8db8aaf40d0b5cb9c5b3a85204cb7d63c3baa3054126ab4c9a2db527e6835a069d7 SHA512 9142f932c958138b4bac32f503a550e6c73b61612690a280dcb98efe8c367aa6bd3cd88b4ed4decec376bb87596a780a21bdcb01d4a3573a1c44fbeb0aa49d23 -DIST Botan-3.0.0.tar.xz 8752380 BLAKE2B 06ac29dc0cbaef43a38cc30185f431e1b1f4083469fdea19ee5d77ada6633022746b8ae2419bd00872f9b3892af9c61a455bc88f77bef84f451938dffd27bde3 SHA512 d67ac0f9d67f6869b7a35d4a7c5e96ffcc619f7e44ead36b4cd0906f3d925d12181566aace03ac719ef54d819ae1158febc0b25839beed5f92eade06d510b594 -DIST Botan-3.0.0.tar.xz.asc 488 BLAKE2B 6a34817ec4700983151f97d2e278870736860ac72f3936fcc63e241d89ba758bdf7765d3c877d88019055562a6067c278ecbac263e8d87cc310790089e47f662 SHA512 46ff64bb4d215a48b0549d90ae2461ae39ae5ecf588a7e130876759ec30561c5a2db77ee9cdc7a3dab990927b51ea732f5b56592bdc150062ca25690378ab817 +DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B c31365e6bd4106f96a033e5f092c528c0185577f41d9a698d2630ece0f660f87f03e0775ebeb5c4d812819bbc6eb556b5ff15c16f243288ae73c8bf1fbb991ce SHA512 ed6bdadb910b0775245648140212953ed364aa26107f851e39ac5cb664d7f476c519a22cdad41f0e520796c4ebe453c56ca68a2178e39f815d445e9979333795 +DIST Botan-3.1.1.tar.xz.asc 488 BLAKE2B 9ac94473d90a26932e507cdb3f46d8381565deecff38a5a2f7fe043b33405071adf0baee4235dd94bb6d35fa3ffedca6192fb5f5d76030874a90a399d88f9744 SHA512 f52e8602a57f590150f6f49829e788910006e5113ab6e85c6efe73009b8db752b5f28b869c6265ef6dd3c2727c64c0182d125f02f92485485768416c618acdb9 +DIST Botan-3.2.0.tar.xz 8998204 BLAKE2B f21e7574af93ab3331607f4a4ecf1b2cbbc0db4b510ea8ad19a5286d46d3a8e37e13746d2d4751eb16a70fdc8371b4435b030ef0a17f1ab6dcd76bd81bb3a4fa SHA512 526cf71144584fef6e73f14f6aa1e2a7b03a92a3e51436287764bb61e742a94e02926bcc2aab038f08ef2169cb511152c8ecd71d51e06deb4875dc676875c2d9 +DIST Botan-3.2.0.tar.xz.asc 488 BLAKE2B f7bc716dd18eedf35928933e22c75de3d2731330dfdaf8a5048e8ad86e1f3896ea55294a64b7f82593af16dd2e4097a9ba68f25baa024e175b7334478bcf84a6 SHA512 3ee42ac73e1bd6cea0a2e9f468b88d67c02a4a69786c41ddf9fc7f94b6847be00e0f3f0f38f934ab599b8d6dd29006414294df8b371f5cf2422292f3dd176756 diff --git a/dev-libs/botan/botan-2.19.3-r2.ebuild b/dev-libs/botan/botan-2.19.3-r2.ebuild index 3059e4d2c09e..fbab36fb5bef 100644 --- a/dev-libs/botan/botan-2.19.3-r2.ebuild +++ b/dev-libs/botan/botan-2.19.3-r2.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc -inherit edo python-r1 toolchain-funcs verify-sig +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/botan.asc +inherit edo multiprocessing python-r1 toolchain-funcs verify-sig MY_P="Botan-${PV}" DESCRIPTION="C++ crypto library" @@ -173,7 +173,7 @@ src_configure() { } src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test$(ver_cut 1) || die "Validation tests failed" + LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" } src_install() { diff --git a/dev-libs/botan/botan-3.0.0-r2.ebuild b/dev-libs/botan/botan-3.1.1.ebuild index 866ca3ab1f23..db9e865b7af6 100644 --- a/dev-libs/botan/botan-3.0.0-r2.ebuild +++ b/dev-libs/botan/botan-3.1.1.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc -inherit edo python-r1 toolchain-funcs verify-sig +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/botan.asc +inherit edo flag-o-matic multiprocessing python-r1 toolchain-funcs verify-sig MY_P="Botan-${PV}" DESCRIPTION="C++ crypto library" @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" # New major versions are parallel-installable SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos" IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" RESTRICT="!test? ( test )" @@ -49,6 +49,7 @@ BDEPEND=" $(python_gen_any_dep ' doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) ') + || ( >=sys-devel/gcc-11:* >=sys-devel/clang-14:* ) verify-sig? ( sec-keys/openpgp-keys-botan ) " @@ -61,7 +62,23 @@ python_check_deps() { python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } +pkg_pretend() { + [[ ${MERGE_TYPE} == binary ]] && return + + # bug #908958 + if tc-is-gcc && ver_test $(gcc-version) -lt 11 ; then + eerror "Botan needs >=gcc-11 or >=clang-14 to compile." + eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" + die "GCC version is too old to compile Botan!" + elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then + eerror "Botan needs >=gcc-11 or >=clang-14 to compile." + eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + die "Clang version is too old to compile Botan!" + fi +} + src_configure() { + tc-export AR CC CXX python_setup local disable_modules=( @@ -167,19 +184,29 @@ src_configure() { ) fi - tc-export AR CC CXX + local sanitizers=() + if is-flagq -fsanitize=address ; then + sanitizers+=( address ) + fi + if is-flagq -fsanitize=undefined ; then + sanitizers+=( undefined ) + fi + filter-flags '-fsanitize=*' + myargs+=( + --enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}") + ) edo ${EPYTHON} configure.py --verbose "${myargs[@]}" } src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test$(ver_cut 1) || die "Validation tests failed" + LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" } src_install() { default - if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then + if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then # --docdir in configure controls the parent directory unfortunately mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die fi diff --git a/dev-libs/botan/botan-2.19.2.ebuild b/dev-libs/botan/botan-3.2.0-r1.ebuild index e899feaea56b..013aaacf837b 100644 --- a/dev-libs/botan/botan-2.19.2.ebuild +++ b/dev-libs/botan/botan-3.2.0-r1.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc -inherit edo python-r1 toolchain-funcs verify-sig +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/botan.asc +inherit edo flag-o-matic multiprocessing ninja-utils python-r1 toolchain-funcs verify-sig MY_P="Botan-${PV}" DESCRIPTION="C++ crypto library" @@ -15,13 +15,14 @@ SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" -SLOT="2/$(ver_cut 1-2)" # soname version -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" +# New major versions are parallel-installable +SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos" IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" RESTRICT="!test? ( test )" CPU_USE=( - cpu_flags_arm_{aes,neon} + cpu_flags_arm_{aes,neon,sha1,sha2} cpu_flags_ppc_altivec cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2} ) @@ -39,25 +40,49 @@ DEPEND=" sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= ) " -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + !<dev-libs/botan-2.19.3-r1:2[tools] +" BDEPEND=" ${PYTHON_DEPS} + ${NINJA_DEPEND} $(python_gen_any_dep ' doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) ') + || ( >=sys-devel/gcc-11:* >=sys-devel/clang-14:* ) verify-sig? ( sec-keys/openpgp-keys-botan ) " # NOTE: Considering patching Botan? # Please see upstream's guidance: # https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches +PATCHES=( + "${FILESDIR}"/${P}-ninja.patch +) python_check_deps() { use doc || return 0 python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } +pkg_pretend() { + [[ ${MERGE_TYPE} == binary ]] && return + + # bug #908958 + if tc-is-gcc && ver_test $(gcc-version) -lt 11 ; then + eerror "Botan needs >=gcc-11 or >=clang-14 to compile." + eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" + die "GCC version is too old to compile Botan!" + elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then + eerror "Botan needs >=gcc-11 or >=clang-14 to compile." + eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + die "Clang version is too old to compile Botan!" + fi +} + src_configure() { + tc-export AR CC CXX python_setup local disable_modules=( @@ -104,6 +129,8 @@ src_configure() { # TODO: POWER Crypto (new CPU_FLAGS_PPC?) $(usev !cpu_flags_arm_aes '--disable-armv8crypto') $(usev !cpu_flags_arm_neon '--disable-neon') + $(usev !cpu_flags_arm_sha1 '--disable-armv8crypto') + $(usev !cpu_flags_arm_sha2 '--disable-armv8crypto') $(usev !cpu_flags_ppc_altivec '--disable-altivec') $(usev !cpu_flags_x86_aes '--disable-aes-ni') $(usev !cpu_flags_x86_avx2 '--disable-avx2') @@ -115,7 +142,7 @@ src_configure() { $(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1') $(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2') - # HPPA's GCC doesn't support SSP (presumably due to stack direction) + # HPPA's GCC doesn't support SSP $(usev hppa '--without-stack-protector') $(use_with boost) @@ -127,11 +154,14 @@ src_configure() { $(use_with sqlite sqlite3) $(use_with zlib) + --build-tool=ninja --cpu=${chostarch} --docdir=share/doc --disable-modules=$(IFS=","; echo "${disable_modules[*]}") --distribution-info="Gentoo ${PVR}" --libdir="$(get_libdir)" + # Avoid collisions between slots for tools (bug #905700) + --program-suffix=$(ver_cut 1) # Don't install Python bindings automatically # (do it manually later in the right place) @@ -161,20 +191,39 @@ src_configure() { ) fi - tc-export AR CC CXX + local sanitizers=() + if is-flagq -fsanitize=address ; then + sanitizers+=( address ) + fi + if is-flagq -fsanitize=undefined ; then + sanitizers+=( undefined ) + fi + filter-flags '-fsanitize=*' + myargs+=( + --enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}") + ) edo ${EPYTHON} configure.py --verbose "${myargs[@]}" } +src_compile() { + eninja +} + src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" + LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" } src_install() { - default + DESTDIR="${D}" eninja install + + if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then + # --docdir in configure controls the parent directory unfortunately + mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die + fi # Manually install the Python bindings (bug #723096) if use python ; then - python_foreach_impl python_domodule src/python/botan2.py + python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py fi } diff --git a/dev-libs/botan/files/botan-3.2.0-ninja.patch b/dev-libs/botan/files/botan-3.2.0-ninja.patch new file mode 100644 index 000000000000..826fc496fb31 --- /dev/null +++ b/dev-libs/botan/files/botan-3.2.0-ninja.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/915544 +https://github.com/randombit/botan/commit/a1a32558669a6751e39420b26930d477790509ce + +From a1a32558669a6751e39420b26930d477790509ce Mon Sep 17 00:00:00 2001 +From: Jack Lloyd <jack@randombit.net> +Date: Wed, 11 Oct 2023 07:36:31 -0400 +Subject: [PATCH] Fix Ninja build to pass instruction set flags to the compiler + +Fixes #3750 +--- a/src/build-data/ninja.in ++++ b/src/build-data/ninja.in +@@ -161,6 +161,7 @@ build tidy: tidy + + %{for lib_build_info} + build %{obj}: compile_lib %{src} ++ isa_flags = %{isa_flags} + %{endfor} + + %{for cli_build_info} + diff --git a/dev-libs/boxfort/boxfort-0.1.1.ebuild b/dev-libs/boxfort/boxfort-0.1.1.ebuild index c7cabdbb8bf7..a9bd21264bdc 100644 --- a/dev-libs/boxfort/boxfort-0.1.1.ebuild +++ b/dev-libs/boxfort/boxfort-0.1.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Snaipe/BoxFort/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 -riscv ~x86" +KEYWORDS="-alpha amd64 ~arm ~arm64 -hppa -ia64 -loong -m68k -mips -ppc -ppc64 -riscv -s390 -sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/boxfort/boxfort-0.1.4.ebuild b/dev-libs/boxfort/boxfort-0.1.4.ebuild index 5ba94e06da9f..30403b1e76ef 100644 --- a/dev-libs/boxfort/boxfort-0.1.4.ebuild +++ b/dev-libs/boxfort/boxfort-0.1.4.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}"/BoxFort-${PV} LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 -loong -riscv -s390 ~x86" +KEYWORDS="-alpha amd64 ~arm ~arm64 -hppa -ia64 -loong -m68k -mips -ppc -ppc64 -riscv -s390 -sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest index 8929119daeb4..e7cb8aa0f471 100644 --- a/dev-libs/c-blosc/Manifest +++ b/dev-libs/c-blosc/Manifest @@ -1,2 +1 @@ -DIST c-blosc-1.21.3.gh.tar.gz 1532077 BLAKE2B ff8ad36e4e34b245062025c5820655bb52fea40276e88a748253d5079c3b5f8662079f177835ab38aa6e58d87e7849a93d7e1289346fcc53c077ef85b7382462 SHA512 e9542aa2d1ebae9f6dcc12916d7ac3b920d771281ab96e2b2d59c2951e5f51d02d2684859b8823643d43d320613fb9dd8a3ea411ade34e66e323fcefa8165a91 -DIST c-blosc-1.21.4.gh.tar.gz 2458878 BLAKE2B 5b58e5069ed99e67adaef832871d45e4e3b88dede169833b07bb1800d35d6d43909c59645f79c003f9a80604e432c81f7d5da35fd19899fbb0378e81f015b0fa SHA512 cbe8406dc88318a582b6ea5e5ba1a25b66814f741743dd512b1a61664691977bfe0896baf24d2e998cdbb209a3ba83c6eb79e86bc1e7a2eb5ef2cde697e8eb65 +DIST c-blosc-1.21.5.gh.tar.gz 2458960 BLAKE2B f56e19146a1522554d5e8de23f580125a6181b50f1898c8e622e8ac50f2f40ab4cdaba62a5a2bc6ff437257550e205090ebe66bb8840202a26567abfc63fbf53 SHA512 01e6d80e1114d76c4bd1b413778c293d0455879ec38e1e1ec46e8e7eaf2997b47cc2de35bc52cdc4c2c70341b6f87d70626a9a9c24ffc8b7b170d760efa60c07 diff --git a/dev-libs/c-blosc/c-blosc-1.21.4.ebuild b/dev-libs/c-blosc/c-blosc-1.21.4.ebuild deleted file mode 100644 index a5c63c1a8c94..000000000000 --- a/dev-libs/c-blosc/c-blosc-1.21.4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE=" - https://www.blosc.org/ - https://github.com/Blosc/c-blosc/ -" -SRC_URI=" - https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+lz4 +snappy test zlib zstd" -RESTRICT="!test? ( test )" - -DEPEND=" - lz4? ( >=app-arch/lz4-1.7.5:= ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} -" - -src_configure() { - # remove bundled libs (just in case) - rm -rf internal-complibs || die - - local mycmakeargs=( - -DBUILD_STATIC=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DBUILD_FUZZERS=OFF - -DDEACTIVATE_LZ4=$(usex !lz4) - -DDEACTIVATE_SNAPPY=$(usex !snappy) - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - # snappy is always external - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - ) - cmake_src_configure -} diff --git a/dev-libs/c-blosc/c-blosc-1.21.3.ebuild b/dev-libs/c-blosc/c-blosc-1.21.5.ebuild index c845b48cd4a5..5003f52c8089 100644 --- a/dev-libs/c-blosc/c-blosc-1.21.3.ebuild +++ b/dev-libs/c-blosc/c-blosc-1.21.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,6 +31,10 @@ RDEPEND=" ${DEPEND} " +PATCHES=( + "${FILESDIR}"/${PN}-1.21.4-no-unaligned.patch +) + src_configure() { # remove bundled libs (just in case) rm -rf internal-complibs || die diff --git a/dev-libs/c-blosc/files/c-blosc-1.21.4-no-unaligned.patch b/dev-libs/c-blosc/files/c-blosc-1.21.4-no-unaligned.patch new file mode 100644 index 000000000000..932df9355a99 --- /dev/null +++ b/dev-libs/c-blosc/files/c-blosc-1.21.4-no-unaligned.patch @@ -0,0 +1,33 @@ +Causes SIGBUS on armv7 (at least in jiji's arm32-on-arm64 chroot) in Pandas test +suite. Unaligned access is UB anyway. +--- a/blosc/blosc-common.h ++++ b/blosc/blosc-common.h +@@ -43,28 +43,6 @@ + */ + #if !defined(BLOSC_STRICT_ALIGN) + #define BLOSC_STRICT_ALIGN +-#if defined(__i386__) || defined(__386) || defined (__amd64) /* GNU C, Sun Studio */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(__i486__) || defined(__i586__) || defined(__i686__) /* GNU C */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(_M_IX86) || defined(_M_X64) /* Intel, MSVC */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(__386) +-#undef BLOSC_STRICT_ALIGN +-#elif defined(_X86_) /* MinGW */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(__I86__) /* Digital Mars */ +-#undef BLOSC_STRICT_ALIGN +-/* Seems like unaligned access in ARM (at least ARMv6) is pretty +- expensive, so we are going to always enforce strict alignment in ARM. +- If anybody suggest that newer ARMs are better, we can revisit this. */ +-/* #elif defined(__ARM_FEATURE_UNALIGNED) */ /* ARM, GNU C */ +-/* #undef BLOSC_STRICT_ALIGN */ +-#elif defined(_ARCH_PPC) || defined(__PPC__) +-/* Modern PowerPC systems (like POWER8) should support unaligned access +- quite efficiently. */ +-#undef BLOSC_STRICT_ALIGN +-#endif + #endif + + #if defined(__SSE2__) diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest index 10231529e8b2..f781cf790fdb 100644 --- a/dev-libs/c-blosc2/Manifest +++ b/dev-libs/c-blosc2/Manifest @@ -1,3 +1,3 @@ -DIST c-blosc2-2.6.1.gh.tar.gz 2365300 BLAKE2B a3fdc8798eb70e97791b7b708ef872142d38b9c4fdb8efc6d5da2010149fa61f4115f27af630a43edd5f351cb8693fbb79457f19ccf1a518f057902b93196b3d SHA512 9f5daa59d5191784ee91deb18ed15a3b36504b05061ca8b1532eaf8e402c793944059894b277843e8da19f00af05615e0865d9fdb80decd83aa07867b0e661a0 -DIST c-blosc2-2.9.1.gh.tar.gz 2793299 BLAKE2B 1853611566f081f5c6236ade1882b07aa6d596f65bb303823f418faaf0e971c1850e3e78ca501650880d4611110200c302896e81a5b13cdf05bc43c81b81dd3a SHA512 9430c026f9d7a98e38915e3d308402989073aa6fa1e8e1d5b9bdb155c70c5cc24ca118cdb5b3584647f72ae80a13be0a8467250af7ef336a1ac72eb8ec8a67f5 -DIST c-blosc2-2.9.2.gh.tar.gz 2790821 BLAKE2B c47c59b7db8c3fbe04e6f63a2474ad325d7c59f5508c42dfc005a690a3020c6479927d5884f909ad106ff4c2aa04523786133a407ec8a54ee92887b24a214428 SHA512 f44346bf3ce8824dbe23d33b688d6b2063406011c066cc14ea3319537c17ecc5c1250c30d77e50696aad9932e0dd10fc95ab4f2c295208808446525636314522 +DIST c-blosc2-2.10.5.gh.tar.gz 3144174 BLAKE2B a680def405f2383636185ab1b71a42e042dd0c71025bfc898b48f148f4a6bf27cbd38f29512caae9ff5b58f70cb35289b609c84b132c0795915d1fe6c71b3feb SHA512 bc004fe2132a8e36963437d5279506c2f79dcbf11ee1a768954c20d1265d120dc85e67952b567e716105c5716922da8ee8cffd0a5d44bc67093a4cab3075e322 +DIST c-blosc2-2.11.2.gh.tar.gz 3144952 BLAKE2B 312a6778a75badf687ebf0cbd8a7a4887ea183c4ed189f5d58007baf81154fb8de5269ec1066c5d1f75bd8855404915338f012e348f9aa26f10ada7823f68b4f SHA512 667fc69fd99cc792bc3439246b9e89b823e9c7e0fc497775c1aaa1d12c6368582dac2db93770a8cd732f29c1e93b082e108b641f221b3dae614e9b8a644718b0 +DIST c-blosc2-2.11.3.gh.tar.gz 3145288 BLAKE2B 140ca9693f2a779e37d324c6a631cde915b7bd7e16c5d48c779872dbc2a688773c22145bd224b8a7ac8e355b2639d08723ff1e4dc59cd57f2f4da89eea2d2c7c SHA512 51652056e646dd29496d8e7a4c3fc1c84af5f2a389b9057d0189d45fd298d64a581bf9f92f688397ff941dc18e03123cf7cd190fea91e3c127c36ad1d775bf79 diff --git a/dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.10.5.ebuild index e5125d6eca4c..be1da45c49b8 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.10.5.ebuild @@ -17,8 +17,8 @@ SRC_URI=" LICENSE="BSD" SLOT="0/1" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="test zlib zstd" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +IUSE="test +zlib +zstd" REQUIRED_USE="test? ( zlib zstd )" RESTRICT="!test? ( test )" @@ -31,6 +31,10 @@ RDEPEND=" ${DEPEND} " +PATCHES=( + "${FILESDIR}"/${PN}-2.9.3-no-unaligned.patch +) + src_configure() { # remove bundled libs (just in case) rm -rf internal-complibs || die @@ -47,6 +51,9 @@ src_configure() { -DPREFER_EXTERNAL_ZLIB=ON -DPREFER_EXTERNAL_ZSTD=ON + # force regular zlib, at least for the time being + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=ON + # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults # from applying, https://github.com/Blosc/c-blosc2/issues/433 -DCMAKE_C_FLAGS="${CFLAGS}" diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.11.2.ebuild index 1a7c40ef0f55..adf6d65c513f 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.9.2.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.11.2.ebuild @@ -17,8 +17,8 @@ SRC_URI=" LICENSE="BSD" SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test zlib zstd" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +IUSE="test +zlib +zstd" REQUIRED_USE="test? ( zlib zstd )" RESTRICT="!test? ( test )" @@ -47,6 +47,9 @@ src_configure() { -DPREFER_EXTERNAL_ZLIB=ON -DPREFER_EXTERNAL_ZSTD=ON + # force regular zlib, at least for the time being + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=ON + # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults # from applying, https://github.com/Blosc/c-blosc2/issues/433 -DCMAKE_C_FLAGS="${CFLAGS}" diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.11.3.ebuild index 842752b8909c..15ee45b69056 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.11.3.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/1" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test zlib zstd" +IUSE="test +zlib +zstd" REQUIRED_USE="test? ( zlib zstd )" RESTRICT="!test? ( test )" @@ -31,11 +31,6 @@ RDEPEND=" ${DEPEND} " -PATCHES=( - # https://bugs.gentoo.org/906644 - "${FILESDIR}/${P}-header.patch" -) - src_configure() { # remove bundled libs (just in case) rm -rf internal-complibs || die @@ -52,6 +47,9 @@ src_configure() { -DPREFER_EXTERNAL_ZLIB=ON -DPREFER_EXTERNAL_ZSTD=ON + # force regular zlib, at least for the time being + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=ON + # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults # from applying, https://github.com/Blosc/c-blosc2/issues/433 -DCMAKE_C_FLAGS="${CFLAGS}" diff --git a/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch deleted file mode 100644 index 5ec28e936de7..000000000000 --- a/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 04035a3759b8c100e4808918e44a3eaef4969875 Mon Sep 17 00:00:00 2001 -From: Dimitri Papadopoulos - <3234522+DimitriPapadopoulos@users.noreply.github.com> -Date: Sat, 13 May 2023 21:40:32 +0200 -Subject: [PATCH] BLOSC_STUNE is not defined in c-blosc - -Therefore, do not guard it with BLOSC_H, the include guard of blosc.h -from previous version c-blosc. ---- - include/blosc2.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/include/blosc2.h b/include/blosc2.h -index dc6d1fc7..ef035f07 100644 ---- a/include/blosc2.h -+++ b/include/blosc2.h -@@ -211,9 +211,7 @@ enum { - * @brief Codes for the different tunes shipped with Blosc - */ - enum { --#ifndef BLOSC_H - BLOSC_STUNE = 0, --#endif // BLOSC_H - BLOSC_LAST_TUNE = 1, - //!< Determine the last tune defined by Blosc. - BLOSC_LAST_REGISTERED_TUNE = BLOSC2_GLOBAL_REGISTERED_TUNE_START + BLOSC2_GLOBAL_REGISTERED_TUNES - 1, diff --git a/dev-libs/c-blosc2/files/c-blosc2-2.9.3-no-unaligned.patch b/dev-libs/c-blosc2/files/c-blosc2-2.9.3-no-unaligned.patch new file mode 100644 index 000000000000..5e6ca9c9ee9a --- /dev/null +++ b/dev-libs/c-blosc2/files/c-blosc2-2.9.3-no-unaligned.patch @@ -0,0 +1,32 @@ +Causes SIGBUS on armv7 (at least in jiji's arm32-on-arm64 chroot) in Pandas test +suite. Unaligned access is UB anyway. +--- a/include/blosc2/blosc2-common.h ++++ b/include/blosc2/blosc2-common.h +@@ -47,27 +47,6 @@ + */ + #if !defined(BLOSC_STRICT_ALIGN) + #define BLOSC_STRICT_ALIGN +-#if defined(__i386__) || defined(__386) || defined (__amd64) /* GNU C, Sun Studio */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(__i486__) || defined(__i586__) || defined(__i686__) /* GNU C */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(_M_IX86) || defined(_M_X64) /* Intel, MSVC */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(__386) +-#undef BLOSC_STRICT_ALIGN +-#elif defined(_X86_) /* MinGW */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(__I86__) /* Digital Mars */ +-#undef BLOSC_STRICT_ALIGN +-/* Modern ARM systems (like ARM64) should support unaligned access +- quite efficiently. */ +-#elif defined(__ARM_FEATURE_UNALIGNED) /* ARM, GNU C */ +-#undef BLOSC_STRICT_ALIGN +-#elif defined(_ARCH_PPC) || defined(__PPC__) +-/* Modern PowerPC systems (like POWER8) should support unaligned access +- quite efficiently. */ +-#undef BLOSC_STRICT_ALIGN +-#endif + #endif + + #if defined(__SSE2__) diff --git a/dev-libs/cJSON/Manifest b/dev-libs/cJSON/Manifest index 7b18c4778b8a..58a26a623cbf 100644 --- a/dev-libs/cJSON/Manifest +++ b/dev-libs/cJSON/Manifest @@ -1 +1 @@ -DIST cJSON-1.7.15.tar.gz 352278 BLAKE2B e0de3b8d56020853d56f5512e6e7216adafd238b6f69bbf6965b153bfe8ebfc23593dfa7cfb8543d8730d90820153d263c8af276c8e9588ba8a5ad76a50f8b72 SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124 +DIST cJSON-1.7.16.tar.gz 353498 BLAKE2B 9dd519b03b24e46fd84798af32d733cec8803d3f5a4b9259352ffe7b1ba0b198a3b4dc0dbdb9cc6247787e49c48beaadc7c31368d8fd695a8ddd711cc0cbfa5b SHA512 3a894de03c33d89f1e7ee572418d5483c844d38e1e64aa4f6297ddaa01f4111f07601f8d26617b424b5af15d469e3955dae075d9f30b5c25e16ec348fdb06e6f diff --git a/dev-libs/cJSON/cJSON-1.7.15.ebuild b/dev-libs/cJSON/cJSON-1.7.16.ebuild index 4829b2f530c3..8f951af9edaf 100644 --- a/dev-libs/cJSON/cJSON-1.7.15.ebuild +++ b/dev-libs/cJSON/cJSON-1.7.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest index b6fb009623c3..3c41eeac7749 100644 --- a/dev-libs/capstone/Manifest +++ b/dev-libs/capstone/Manifest @@ -1,2 +1,2 @@ DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e -DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c SHA512 fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a +DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0 SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5 diff --git a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild b/dev-libs/capstone/capstone-5.0.1.ebuild index c2a407fa7ca8..aebb671d55fe 100644 --- a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild +++ b/dev-libs/capstone/capstone-5.0.1.ebuild @@ -3,8 +3,9 @@ EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools inherit cmake distutils-r1 toolchain-funcs @@ -17,8 +18,9 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git" EGIT_REPO_BRANCH="next" else - SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" - S=${WORKDIR}/${P/_rc/-rc} + MY_PV="${PV/_rc/-rc}" + SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86" fi @@ -35,11 +37,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" distutils_enable_tests setup.py -PATCHES=( - "${FILESDIR}"/${P}-pkgconfig.patch - "${FILESDIR}"/${P}-oob-mem-access.patch -) - if [[ ${PV} == *_rc* ]]; then # Upstream doesn't flag release candidates (bug 858350) QA_PKGCONFIG_VERSION="" diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild deleted file mode 100644 index fe79e806cfad..000000000000 --- a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake distutils-r1 toolchain-funcs - -DESCRIPTION="disassembly/disassembler framework + bindings" -HOMEPAGE="https://www.capstone-engine.org/" -SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/5" # libcapstone.so.5 -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86" - -IUSE="python test" -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) -" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -distutils_enable_tests setup.py - -S=${WORKDIR}/${P/_rc/-rc} - -PATCHES=( - "${FILESDIR}"/${P}-pkgconfig.patch - "${FILESDIR}"/${P}-oob-mem-access.patch -) - -if [[ ${PV} == *_rc* ]]; then - # Upstream doesn't flag release candidates (bug 858350) - QA_PKGCONFIG_VERSION="" -fi - -wrap_python() { - local phase=$1 - shift - - if use python; then - pushd bindings/python >/dev/null || die - distutils-r1_${phase} "$@" - popd >/dev/null || die - fi -} - -src_prepare() { - tc-export RANLIB - cmake_src_prepare - - wrap_python ${FUNCNAME} -} - -src_configure() { - local mycmakeargs=( - -DCAPSTONE_BUILD_TESTS="$(usex test)" - ) - cmake_src_configure - - wrap_python ${FUNCNAME} -} - -src_compile() { - cmake_src_compile - - wrap_python ${FUNCNAME} -} - -src_test() { - cmake_src_test - - wrap_python ${FUNCNAME} -} - -src_install() { - cmake_src_install - - wrap_python ${FUNCNAME} -} diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild index ef624cde1cad..6d46a0133be7 100644 --- a/dev-libs/capstone/capstone-9999.ebuild +++ b/dev-libs/capstone/capstone-9999.ebuild @@ -3,8 +3,9 @@ EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools inherit cmake distutils-r1 toolchain-funcs @@ -17,9 +18,10 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git" EGIT_REPO_BRANCH="next" else - SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" - S=${WORKDIR}/${P/_rc/-rc} - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" + MY_PV="${PV/_rc/-rc}" + SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="BSD" @@ -33,6 +35,13 @@ DEPEND="${RDEPEND} BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + # Currently "-Werror" is only added in the `next`-development branch, but + # not merged into 5.* releases. Eventually this patch may be needed in + # version 5 releas line. See bug #911481. + "${FILESDIR}/${P}-werror.patch" +) + distutils_enable_tests setup.py if [[ ${PV} == *_rc* ]]; then diff --git a/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch b/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch deleted file mode 100644 index 4e538ef4d5fb..000000000000 --- a/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch +++ /dev/null @@ -1,40 +0,0 @@ -Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> -Date: Mon Aug 22 18:52:19 2022 +0200 - - PPC: fix out of bound memory access - - closes #1912 - -Bug: https://bugs.gentoo.org/865151 -Upstream: https://github.com/capstone-engine/capstone/pull/1913 - -diff --git a/arch/PowerPC/PPCInstPrinter.c b/arch/PowerPC/PPCInstPrinter.c -index 22eef4ee..a5a30a8b 100644 ---- a/arch/PowerPC/PPCInstPrinter.c -+++ b/arch/PowerPC/PPCInstPrinter.c -@@ -1116,7 +1116,8 @@ static char *stripRegisterPrefix(const char *RegName) - char *name = cs_strdup(RegName + 2); - - // also strip the last 2 letters -- name[strlen(name) - 2] = '\0'; -+ if(strlen(name) > 2) -+ name[strlen(name) - 2] = '\0'; - - return name; - } -diff --git a/suite/cstest/issues.cs b/suite/cstest/issues.cs -index e4fb6cfa..3183f43f 100644 ---- a/suite/cstest/issues.cs -+++ b/suite/cstest/issues.cs -@@ -1,3 +1,11 @@ -+!# issue 1912 PPC register name -+!# CS_ARCH_PPC, CS_MODE_BIG_ENDIAN, None -+0x2d,0x03,0x00,0x80 == cmpwi cr2, r3, 0x80 -+ -+!# issue 1912 PPC no register name -+!# CS_ARCH_PPC, CS_MODE_BIG_ENDIAN, CS_OPT_SYNTAX_NOREGNAME -+0x2d,0x03,0x00,0x80 == cmpwi 2, 3, 0x80 -+ - !# issue 1839 AArch64 Incorrect detailed disassembly of ldr - !# CS_ARCH_ARM64, CS_MODE_ARM, CS_OPT_DETAIL - 0x41,0x00,0x40,0xf9 == ldr x1, [x2] ; operands[0].access: WRITE ; operands[1].access: READ diff --git a/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch b/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch deleted file mode 100644 index 015220a138e8..000000000000 --- a/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/capstone.pc.in b/capstone.pc.in -index 1b559eac..1ffcd354 100644 ---- a/capstone.pc.in -+++ b/capstone.pc.in -@@ -5,7 +5,7 @@ includedir=${prefix}/include - - Name: capstone - Description: Capstone disassembly engine --Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ -+Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@ - URL: http://www.capstone-engine.org - archive=${libdir}/libcapstone.a - Libs: -L${libdir} -lcapstone diff --git a/dev-libs/capstone/files/capstone-9999-werror.patch b/dev-libs/capstone/files/capstone-9999-werror.patch new file mode 100644 index 000000000000..1ec58fa056a3 --- /dev/null +++ b/dev-libs/capstone/files/capstone-9999-werror.patch @@ -0,0 +1,13 @@ +Bug: https://bugs.gentoo.org/911481 +Upstream: https://github.com/capstone-engine/capstone/pull/2114 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,7 +28,7 @@ project(capstone + if (MSVC) + add_compile_options(/W1 /w14189) + else() +- add_compile_options(-Werror -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context) ++ add_compile_options(-Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context) + endif() + + diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest index 02a4af51321f..afed59928523 100644 --- a/dev-libs/castxml/Manifest +++ b/dev-libs/castxml/Manifest @@ -1 +1,3 @@ DIST castxml-0.5.1.tar.gz 106918 BLAKE2B 9268f149ea5a511d24cbbd0c7faec5bff5eade5a511961d3bb120409691bf2b8aca7f2978e048a759419c097d9d97219a61a122bd37d4f835c1d86827bfb07e3 SHA512 1dff8f5cc6932a159e1132c0b283a28414ea6007c942cac4ae15a1c31789f5bd29efd65a6b5b63d7bc48b3d68c3550804f31bee2658e51082269fc5ecc15590e +DIST castxml-0.6.1.tar.gz 119089 BLAKE2B 8e7ea8254debc05fb2d145a1945228607bb7f903dd7748d81f7647f16f0814d331f98f4be1ab430bbb509afdb18c998be998496ef2a8a2e563169747cae1c91c SHA512 0477209979679ca5cae05d99e3ae9c2850f19a39a310a376047570d9e14b37e32aa2ebdea41d000194343e6ec9a27f21b0fcdf633d8b74733e655d9de70bc2a5 +DIST castxml-0.6.2.tar.gz 119190 BLAKE2B fd3522a19898d96fbcbf7044d8d4c03ec7a5192df0ec28e04eecee753367aca76e53e7320f788877b449ca90ee4f441ade76e833ec6fdc1a73ad4f5dfa64c0e0 SHA512 eec6495b8ed837031b5d41cb09b8f70c497c865fbef47bc51b5f296fb9db852ded0bd13c45c3f3017d7d1eb5976557634e52369a24ddbf1f2cf9705c321bac3b diff --git a/dev-libs/castxml/castxml-0.6.1.ebuild b/dev-libs/castxml/castxml-0.6.1.ebuild new file mode 100644 index 000000000000..61e6bb8b1dff --- /dev/null +++ b/dev-libs/castxml/castxml-0.6.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT=16 +inherit cmake llvm + +DESCRIPTION="C-family abstract syntax tree XML output tool" +HOMEPAGE="https://github.com/CastXML/CastXML" +SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CastXML-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~riscv ~x86" +IUSE="+man test" +RESTRICT="!test? ( test )" + +# See comment in llvm.eclass for why we don't depend on LLVM if we already +# depend on Clang. +RDEPEND=" + <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${RDEPEND} + man? ( dev-python/sphinx ) +" + +PATCHES=( +# "${FILESDIR}"/${PN}-fix-tests.patch +) + +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +src_configure() { + local mycmakeargs=( + -DCastXML_INSTALL_DOC_DIR="share/doc/${PF}" + -DCastXML_INSTALL_MAN_DIR="share/man" + -DSPHINX_MAN="$(usex man)" + -DSPHINX_HTML=OFF + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +} diff --git a/dev-libs/castxml/castxml-0.6.2.ebuild b/dev-libs/castxml/castxml-0.6.2.ebuild new file mode 100644 index 000000000000..167ac162e324 --- /dev/null +++ b/dev-libs/castxml/castxml-0.6.2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT=17 +inherit cmake llvm + +DESCRIPTION="C-family abstract syntax tree XML output tool" +HOMEPAGE="https://github.com/CastXML/CastXML" +SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CastXML-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~riscv ~x86" +IUSE="+man test" +RESTRICT="!test? ( test )" + +# See comment in llvm.eclass for why we don't depend on LLVM if we already +# depend on Clang. +RDEPEND=" + <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${RDEPEND} + man? ( dev-python/sphinx ) +" + +PATCHES=( +# "${FILESDIR}"/${PN}-fix-tests.patch +) + +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +src_configure() { + local mycmakeargs=( + -DCastXML_INSTALL_DOC_DIR="share/doc/${PF}" + -DCastXML_INSTALL_MAN_DIR="share/man" + -DSPHINX_MAN="$(usex man)" + -DSPHINX_HTML=OFF + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +} + +src_test() { + local CMAKE_SKIP_TESTS=( + # Regex doesn't match the full build path + cmd.input-missing + cmd.rsp-missing + + # Gets confused by extra #defines we set for hardening etc (bug #891813) + cmd.cc-gnu-src-cxx-E + cmd.cc-gnu-src-cxx-cmd + cmd.cc-gnu-c-src-c-E + cmd.cc-gnu-c-src-c-cmd + ) + + cmake_src_test +} diff --git a/dev-libs/cdk/cdk-5.0.20221025.ebuild b/dev-libs/cdk/cdk-5.0.20221025.ebuild index 10c92d5e51b7..211f5797ba83 100644 --- a/dev-libs/cdk/cdk-5.0.20221025.ebuild +++ b/dev-libs/cdk/cdk-5.0.20221025.ebuild @@ -5,7 +5,7 @@ EAPI=8 MY_P="${PN}-$(ver_rs 2 -)" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc inherit verify-sig DESCRIPTION="A library of curses widgets" diff --git a/dev-libs/cdk/cdk-5.0.20230201.ebuild b/dev-libs/cdk/cdk-5.0.20230201.ebuild index 10c92d5e51b7..211f5797ba83 100644 --- a/dev-libs/cdk/cdk-5.0.20230201.ebuild +++ b/dev-libs/cdk/cdk-5.0.20230201.ebuild @@ -5,7 +5,7 @@ EAPI=8 MY_P="${PN}-$(ver_rs 2 -)" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc inherit verify-sig DESCRIPTION="A library of curses widgets" diff --git a/dev-libs/cereal/cereal-1.3.2-r2.ebuild b/dev-libs/cereal/cereal-1.3.2-r2.ebuild index 052f9273e3b8..27b2a5ef11f7 100644 --- a/dev-libs/cereal/cereal-1.3.2-r2.ebuild +++ b/dev-libs/cereal/cereal-1.3.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/cglm/Manifest b/dev-libs/cglm/Manifest index 4b9a3c5baa8c..f394e6e7a1de 100644 --- a/dev-libs/cglm/Manifest +++ b/dev-libs/cglm/Manifest @@ -1 +1,3 @@ DIST cglm-0.8.9.tar.gz 631331 BLAKE2B 17f6f8d379aa81ee9327315b121cc7629fcc394fe032c1e1540e5153b2d3b0a2129f27eb46a8ae4323aa826b2bfff310b9039f78953d52d0bd994ba493fcdbd9 SHA512 ac0a042d61c60eac7d6616e5bc0f5c3e77b1a45f58f6732b34edc9a0d714046777e4b490200a3b54c6325ddad5b5faeb3648a299685f748f8b0618ce66a9a7f4 +DIST cglm-0.9.0.tar.gz 642861 BLAKE2B d02cb83abeeea793e5ab7b9473a9a26dcaf3e15209b555c34b6981e3becd6edbd94f0687126114a8917d9f4958575f2cf37a846b7fc54fd236d30198d1fe7aaf SHA512 23ad89df9cd80d69caf0fcf59d6acfbea710d9b6ae50634d4a32718d0214d1624df3bf8f874a76a93c3952e97f94ff48b65103035e87519bb9dbfce7fd2af427 +DIST cglm-0.9.1.tar.gz 657554 BLAKE2B 4b24841b248c3d0606e99b1d71301e3008a5fa6044d0eb76759144aa800875ca890a591e276d237cf801cd09dde513f8e42ecc4eb70288effb641682c899d220 SHA512 05c1e8d1dadafe1c9155db40dd1a4c209283c41ad2416c11b09967435f8047471afa5ee521ef6b8ef22c3e8b3988ab0865137057b33441e7851bc57979509dd6 diff --git a/dev-libs/cglm/cglm-0.8.9.ebuild b/dev-libs/cglm/cglm-0.9.0.ebuild index c08a2059bd9c..8adee7688d32 100644 --- a/dev-libs/cglm/cglm-0.8.9.ebuild +++ b/dev-libs/cglm/cglm-0.9.0.ebuild @@ -2,7 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit meson + +DOCS_BUILDER="sphinx" +DOCS_AUTODOC=1 +DOCS_DEPEND="dev-python/sphinx-rtd-theme" +DOCS_DIR="${S}/docs/source" + +PYTHON_COMPAT=( python3_{9..11} ) +inherit python-any-r1 docs meson DESCRIPTION="OpenGL Mathematics (glm) for C" HOMEPAGE="https://github.com/recp/cglm" @@ -15,10 +22,19 @@ IUSE="test" RESTRICT="!test? ( test )" +src_prepare() { + default + # DOCS_DEPEND needs DOCS_AUTODOC which needs the extension + sed -i -e "/^extensions/s/$/ 'sphinx.ext.autodoc',/" docs/source/conf.py || die +} src_configure() { local emesonargs=( - "-Dwerror=false" $(meson_use test build_tests) ) meson_src_configure } + +src_compile() { + meson_src_compile + docs_compile +} diff --git a/dev-libs/cglm/cglm-0.9.1.ebuild b/dev-libs/cglm/cglm-0.9.1.ebuild new file mode 100644 index 000000000000..8adee7688d32 --- /dev/null +++ b/dev-libs/cglm/cglm-0.9.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="sphinx" +DOCS_AUTODOC=1 +DOCS_DEPEND="dev-python/sphinx-rtd-theme" +DOCS_DIR="${S}/docs/source" + +PYTHON_COMPAT=( python3_{9..11} ) +inherit python-any-r1 docs meson + +DESCRIPTION="OpenGL Mathematics (glm) for C" +HOMEPAGE="https://github.com/recp/cglm" +SRC_URI="https://github.com/recp/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +src_prepare() { + default + # DOCS_DEPEND needs DOCS_AUTODOC which needs the extension + sed -i -e "/^extensions/s/$/ 'sphinx.ext.autodoc',/" docs/source/conf.py || die +} +src_configure() { + local emesonargs=( + $(meson_use test build_tests) + ) + meson_src_configure +} + +src_compile() { + meson_src_compile + docs_compile +} diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest index 65c9a396443f..fcf843c72292 100644 --- a/dev-libs/clhpp/Manifest +++ b/dev-libs/clhpp/Manifest @@ -1,2 +1 @@ -DIST clhpp-2023.02.06.tar.gz 106874 BLAKE2B c57cdff048fe80b8fd95f14a77883f0d3eb7a64f7b9fea2661e0127172783ece911f908d7b6597e1b1b2cdfc86c1d841a3047d295a85408ba4c25cb5c8a262f8 SHA512 30252a832287375d550a5e184779881d5b22207a636298c7f52f277c219d3a1ae6983259cfea7bf4f90f0840fec114ee0e7a8c1e6a6fe48c24fd3b5119e7a7f8 DIST clhpp-2023.04.17.tar.gz 115042 BLAKE2B df0db751eda9fe2f23a5e3ef97f263885a09ca4b341b24c9580522e84a192e9afe526a441d0e3660e8819492945b2ff89bff7c96cd1fd1b3bd6a177042ec759e SHA512 1e37af647a37737240de1622bd772e1f154a07c2d27e020487163c42d0833096c1a2f2f2185b8f6371889c2cad3992f0c7a9d233c36941367da743ee7ee8e486 diff --git a/dev-libs/clhpp/clhpp-2023.02.06.ebuild b/dev-libs/clhpp/clhpp-2023.02.06.ebuild deleted file mode 100644 index 366b4f04fcb7..000000000000 --- a/dev-libs/clhpp/clhpp-2023.02.06.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN="OpenCL-CLHPP" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Khronos OpenCL C++ bindings" -HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/" -SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Khronos-CLHPP" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="test" - -# Tests require CMock (NOT cmocka), which is currently not in Gentoo -# and has been found to be extremely awkward to package. -# Should it ever get packaged, consult git history for how to set things up -# for the clhpp test suite. -RESTRICT="test" - -RDEPEND="virtual/opencl" -DEPEND="${RDEPEND} - >=dev-util/opencl-headers-${PV}" - -S="${WORKDIR}"/${MY_P} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCS=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTING=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-libs/clhpp/clhpp-2023.04.17.ebuild b/dev-libs/clhpp/clhpp-2023.04.17.ebuild index a9a4c55d1789..9c106083d8d2 100644 --- a/dev-libs/clhpp/clhpp-2023.04.17.ebuild +++ b/dev-libs/clhpp/clhpp-2023.04.17.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g LICENSE="Khronos-CLHPP" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" IUSE="test" # Tests require CMock (NOT cmocka), which is currently not in Gentoo diff --git a/dev-libs/clipper/Manifest b/dev-libs/clipper/Manifest deleted file mode 100644 index 1a844b9607da..000000000000 --- a/dev-libs/clipper/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST clipper-6.4.2.zip 2535706 BLAKE2B 755dcfd759888bda7114af784d9e684f36ce8f6e43dcadf07f5797e3723d392aab2ea9b80cb212b7eb3177bfb306ca20a797546cb2c382132887e62fa0dffd93 SHA512 ffc88818c44a38aa278d5010db6cfd505796f39664919f1e48c7fa9267563f62135868993e88f7246dcd688241d1172878e4a008a390648acb99738452e3e5dd diff --git a/dev-libs/clipper/clipper-6.4.2.ebuild b/dev-libs/clipper/clipper-6.4.2.ebuild deleted file mode 100644 index 37050fb9bc05..000000000000 --- a/dev-libs/clipper/clipper-6.4.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit cmake - -MY_PV="ver${PV}" -MY_P="${PN}_${MY_PV}" - -DESCRIPTION="Polygon and line clipping and offsetting library (C++, C#, Delphi)" -HOMEPAGE="http://www.angusj.com/delphi/clipper.php" -SRC_URI="mirror://sourceforge/project/polyclipping/${MY_P}.zip -> ${P}.zip" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" - -IUSE="" - -RDEPEND="" -BDEPEND="app-arch/unzip" - -S="${WORKDIR}/cpp" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - ) - cmake_src_configure -} diff --git a/dev-libs/clipper/metadata.xml b/dev-libs/clipper/metadata.xml deleted file mode 100644 index e8c28d1b439f..000000000000 --- a/dev-libs/clipper/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>3dprint@gentoo.org</email> - <name>Gentoo 3D Printer Project</name> - </maintainer> - <longdescription> - The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or, - and line & polygon offsetting. The library is based on Vatti's clipping algorithm. - </longdescription> - <upstream> - <bugs-to>https://sourceforge.net/p/polyclipping/bugs/</bugs-to> - <doc>http://www.angusj.com/delphi/clipper/documentation/Docs/Overview/_Body.htm</doc> - <remote-id type="sourceforge">polyclipping</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-libs/confuse/confuse-3.3-r1.ebuild b/dev-libs/confuse/confuse-3.3-r1.ebuild index d295eaa990b1..164f9d86f456 100644 --- a/dev-libs/confuse/confuse-3.3-r1.ebuild +++ b/dev-libs/confuse/confuse-3.3-r1.ebuild @@ -5,8 +5,8 @@ EAPI=7 inherit multilib-minimal flag-o-matic DESCRIPTION="a configuration file parser library" -HOMEPAGE="https://github.com/martinh/libconfuse" -SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz" +HOMEPAGE="https://github.com/libconfuse/libconfuse" +SRC_URI="https://github.com/libconfuse/libconfuse/releases/download/v${PV}/${P}.tar.xz" LICENSE="ISC" SLOT="0/2.1.0" diff --git a/dev-libs/confuse/confuse-3.3-r2.ebuild b/dev-libs/confuse/confuse-3.3-r2.ebuild index 8eaa626a37bc..6a45dae70813 100644 --- a/dev-libs/confuse/confuse-3.3-r2.ebuild +++ b/dev-libs/confuse/confuse-3.3-r2.ebuild @@ -5,8 +5,8 @@ EAPI=7 inherit multilib-minimal flag-o-matic DESCRIPTION="a configuration file parser library" -HOMEPAGE="https://github.com/martinh/libconfuse" -SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz" +HOMEPAGE="https://github.com/libconfuse/libconfuse" +SRC_URI="https://github.com/libconfuse/libconfuse/releases/download/v${PV}/${P}.tar.xz" LICENSE="ISC" SLOT="0/2.1.0" diff --git a/dev-libs/confuse/confuse-3.3.ebuild b/dev-libs/confuse/confuse-3.3.ebuild index 7ae31e88096c..db0ee9ad1df8 100644 --- a/dev-libs/confuse/confuse-3.3.ebuild +++ b/dev-libs/confuse/confuse-3.3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit multilib-minimal DESCRIPTION="a configuration file parser library" -HOMEPAGE="https://github.com/martinh/libconfuse" -SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz" +HOMEPAGE="https://github.com/libconfuse/libconfuse" +SRC_URI="https://github.com/libconfuse/libconfuse/releases/download/v${PV}/${P}.tar.xz" LICENSE="ISC" SLOT="0/2.1.0" diff --git a/dev-libs/confuse/metadata.xml b/dev-libs/confuse/metadata.xml index 419da6b02fbc..10287e70c63f 100644 --- a/dev-libs/confuse/metadata.xml +++ b/dev-libs/confuse/metadata.xml @@ -4,6 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="cpe">cpe:/a:libconfuse_project:libconfuse</remote-id> - <remote-id type="github">martinh/libconfuse</remote-id> + <remote-id type="github">libconfuse/libconfuse</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/cowsql/Manifest b/dev-libs/cowsql/Manifest new file mode 100644 index 000000000000..eb2d4154fb4c --- /dev/null +++ b/dev-libs/cowsql/Manifest @@ -0,0 +1 @@ +DIST cowsql-1.15.4.tar.gz 364167 BLAKE2B c633aa4ad0e55954702995003a1651a220bd6bd1b2a14675d50a04596e7652a3453b63e4e32c8d74cf34c4fae6c1f33cb5054bd347d80dc34032d215ee25bd8c SHA512 06d28723eac1a75cffef6b8e0d8e17696ddc8520345d3b5e1fdada86aa5ee1bbd5a66198a36ee7f7776559392e84908980fd54321ff9c8eb2729dec5a6ac9dd7 diff --git a/dev-libs/cowsql/cowsql-1.15.4.ebuild b/dev-libs/cowsql/cowsql-1.15.4.ebuild new file mode 100644 index 000000000000..6c74e52fded0 --- /dev/null +++ b/dev-libs/cowsql/cowsql-1.15.4.ebuild @@ -0,0 +1,49 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine (fork of dqlite)" +HOMEPAGE="https://cowsql.dev/ https://github.com/cowsql/cowsql" +SRC_URI="https://github.com/cowsql/cowsql/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3-with-linking-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-db/sqlite:3 + dev-libs/libuv:= + >=dev-libs/raft-0.18.1:=" +DEPEND="${RDEPEND} + test? ( dev-libs/raft[lz4,test] )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/dqlite-1.12.0-disable-werror.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-backtrace + --disable-debug + --disable-sanitize + --disable-static + + # Will build a bundled libsqlite3.so. + --enable-build-sqlite=no + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/cowsql/files/dqlite-1.12.0-disable-werror.patch b/dev-libs/cowsql/files/dqlite-1.12.0-disable-werror.patch new file mode 100644 index 000000000000..9c92324688d6 --- /dev/null +++ b/dev-libs/cowsql/files/dqlite-1.12.0-disable-werror.patch @@ -0,0 +1,20 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2022-11-18 16:44:34.000000000 +0200 ++++ b/configure.ac 2022-11-19 09:21:24.157589426 +0200 +@@ -3,7 +3,7 @@ + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_AUX_DIR([ac]) + +-AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror -Wno-portability foreign]) ++AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-portability foreign]) + AM_SILENT_RULES([yes]) + + AC_PROG_CC_STDC +@@ -82,7 +82,6 @@ + -Wdate-time \ + -Wnested-externs \ + -Wconversion \ +- -Werror \ + ]) + # To enable: + # diff --git a/dev-libs/cowsql/metadata.xml b/dev-libs/cowsql/metadata.xml new file mode 100644 index 000000000000..25c078695e9c --- /dev/null +++ b/dev-libs/cowsql/metadata.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>juippis@gentoo.org</email> + <name>Joonas Niilola</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + <longdescription> + cowsql is a C library that implements an embeddable and replicated SQL + database engine with high-availability and automatic failover. + + Cowsql is a fork from dqlite. + The acronym "dqlite" stands for "distributed SQLite", meaning that dqlite + extends SQLite with a network protocol that can connect together various + instances of your application and have them act as a highly-available + cluster, with no dependency on external databases. + </longdescription> + <upstream> + <remote-id type="github">cowsql/cowsql</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/cpuinfo/Manifest b/dev-libs/cpuinfo/Manifest index 3dd4455b3d37..a636f22f3081 100644 --- a/dev-libs/cpuinfo/Manifest +++ b/dev-libs/cpuinfo/Manifest @@ -1,2 +1,3 @@ DIST cpuinfo-2022.03.26.tar.gz 3503965 BLAKE2B 03607ea04de156907d230dc9f009d72bf6d36ae7391c190c68dbc3f9a4c395e8ec72f935f6ae032d6b1341432278df3aee6f9fe7f7cad1b82784ecec5084d373 SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c DIST cpuinfo-2022.08.19.tar.gz 3512624 BLAKE2B 909ebde6c522d514641dcbe16586bc972327b8564cb12fa6db25b8978a0a840e627154430f97dd37f024ea4f36a45db8ca5033e6e076390383dd9b35307bed5f SHA512 b3342ce0a1f842084ff53efdfd15c44586ac7cd36249211e2925d84aa1f33ee8d6f76cd62ea20e91d8b908c3c8afda5a47516008b69749504024b9813a623ee2 +DIST cpuinfo-2023.01.13.tar.gz 3513605 BLAKE2B eee9765f30b1dca6f39fb0b1f387f5e1cfaf544e5c9b256391aea913c5b67a012ef45f5afecfcda4a34ab64ca8da2f20e37db58cb4d463f8e312a04965cd40df SHA512 96bd11d3453e98cf1130f0862614e813861e20111655f8c472f29f17048a07d712b4f84b511760fdee995cf3d695112371af0c21cbd144ee3fb6fb6153dd2829 diff --git a/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild b/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild index 03c742c31f6d..fc964a2ae125 100644 --- a/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild +++ b/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild @@ -16,8 +16,6 @@ SLOT="0" KEYWORDS="~amd64" IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" diff --git a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild b/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild index 83ed0a19815c..07d77a29af2f 100644 --- a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild +++ b/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild @@ -16,8 +16,6 @@ SLOT="0" KEYWORDS="~amd64" IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" diff --git a/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild b/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild new file mode 100644 index 000000000000..3b0ec9465234 --- /dev/null +++ b/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild @@ -0,0 +1,43 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +CommitId=6481e8bef08f606ddd627e4d3be89f64d62e1b8a + +DESCRIPTION="CPU INFOrmation library" +HOMEPAGE="https://github.com/pytorch/cpuinfo/" +SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" + +S="${WORKDIR}"/${PN}-${CommitId} + +PATCHES=( + "${FILESDIR}"/${PN}-2022.03.26-gentoo.patch + "${FILESDIR}"/${P}-test.patch +) + +src_prepare() { + cmake_src_prepare + + # >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard + sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \ + CMakeLists.txt || die "sed failed" +} + +src_configure() { + local mycmakeargs=( + -DCPUINFO_BUILD_BENCHMARKS=OFF + -DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF) + ) + cmake_src_configure +} diff --git a/dev-libs/cpuinfo/files/cpuinfo-2023.01.13-test.patch b/dev-libs/cpuinfo/files/cpuinfo-2023.01.13-test.patch new file mode 100644 index 000000000000..65c051556fff --- /dev/null +++ b/dev-libs/cpuinfo/files/cpuinfo-2023.01.13-test.patch @@ -0,0 +1,18 @@ +--- a/test/init.cc 2023-12-02 09:02:56.240873209 +0100 ++++ b/test/init.cc 2023-12-02 09:04:23.240867364 +0100 +@@ -304,6 +304,7 @@ + cpuinfo_deinitialize(); + } + ++#if 0 + TEST(CORE, known_uarch) { + ASSERT_TRUE(cpuinfo_initialize()); + for (uint32_t i = 0; i < cpuinfo_get_cores_count(); i++) { +@@ -314,6 +315,7 @@ + } + cpuinfo_deinitialize(); + } ++#endif + + TEST(CLUSTERS_COUNT, within_bounds) { + ASSERT_TRUE(cpuinfo_initialize()); diff --git a/dev-libs/crc32c/crc32c-1.1.2-r2.ebuild b/dev-libs/crc32c/crc32c-1.1.2-r2.ebuild index 90af416a1a25..e9ecec46cb83 100644 --- a/dev-libs/crc32c/crc32c-1.1.2-r2.ebuild +++ b/dev-libs/crc32c/crc32c-1.1.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest index a96d06c31610..efe260be1d24 100644 --- a/dev-libs/crypto++/Manifest +++ b/dev-libs/crypto++/Manifest @@ -1,2 +1,2 @@ -DIST cryptopp860.zip 9274149 BLAKE2B c93998e2deb93abf12b801877404f0f82547bfbbbc5aae727e68daffc2407877dda76d7bcd06239d40a48baf21b6f2e29f74e9a97ecbc1b5d4b5bcc50ada71da SHA512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03 -DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9b56476ff64de0c28d47a13fe99d7f5819cfeb52e514ade1454622451b267bcc751868defcb080ddf79e8c SHA512 6231816b1ccec75cbcdd09daa8895830c5f4c595a4a0aa24dacc3e377832d8db5efa1aeadf815e53db32fc5263b09dd1b249668f34da4bfad5d5cba6f031ce21 +DIST cryptopp890.zip 9288053 BLAKE2B 95fe0585cff826587a301dd3df863c39cba889d407bb70ae7b35a4f9a0f7f5fef83b1c65cb95923a05f8ae91f18ed20e88738e8bb081a3f9c8c49c2d67d44ecc SHA512 903970c4c0312272e93bae0cc3477be66b273dd38c9329fda9f7157ec44e247a3bc16b9d2b4ad625f258af0eaf2dc2c4210d4d14829b455f180983859a5c4b41 +DIST cryptopp890.zip.sig 659 BLAKE2B 741ec10a01a444573fbcf749258e26461ff131935fede8f47b3f2dd8c51f3b43a9af894e0e31f9ad925baf451bdd747b7e22cc8b178992e4190bba503f9bf648 SHA512 4891cf446a47000453884f36f4f8db2da254e11b573c02690fd5e1de604f01498a479847a732abaf0f75b1cdf3cd5bc104f6be240d0de6c7184a3651c674ac95 diff --git a/dev-libs/crypto++/crypto++-8.6.0.ebuild b/dev-libs/crypto++/crypto++-8.9.0.ebuild index 0b77d971f0e7..57c31351372e 100644 --- a/dev-libs/crypto++/crypto++-8.6.0.ebuild +++ b/dev-libs/crypto++/crypto++-8.9.0.ebuild @@ -1,15 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/crypto++.asc -inherit toolchain-funcs verify-sig +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/crypto++.asc +inherit flag-o-matic toolchain-funcs verify-sig DESCRIPTION="C++ class library of cryptographic schemes" HOMEPAGE="https://cryptopp.com" -SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" -SRC_URI+=" verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig )" +SRC_URI=" + https://www.cryptopp.com/cryptopp${PV//.}.zip + verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig ) +" + S="${WORKDIR}" LICENSE="Boost-1.0" @@ -30,10 +33,6 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-crypto++ ) " -PATCHES=( - "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch" -) - config_uncomment() { sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die } @@ -52,15 +51,23 @@ src_configure() { export LIBDIR="${EPREFIX}/usr/$(get_libdir)" export PREFIX="${EPREFIX}/usr" tc-export AR RANLIB + + # Long history of correctness bugs: + # https://github.com/weidai11/cryptopp/issues/1134 + # https://github.com/weidai11/cryptopp/issues/1141 + # https://github.com/weidai11/cryptopp/pull/1147 + append-flags -fno-strict-aliasing + filter-lto + default } src_compile() { - emake -f GNUmakefile all shared libcryptopp.pc + emake -f GNUmakefile LDCONF=true all shared libcryptopp.pc } src_install() { - default + emake DESTDIR="${D}" LDCONF=true install use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a } diff --git a/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch deleted file mode 100644 index 2ae8d287e12e..000000000000 --- a/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/void-ppc/void-packages/blob/master/srcpkgs/crypto++/patches/musl-soname-links.patch -https://bugs.gentoo.org/762997 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -1256,7 +1256,7 @@ - $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -- $(LDCONF) $(DESTDIR)$(LIBDIR) -+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - endif - endif - ifneq ($(wildcard libcryptopp.pc),) ---- a/GNUmakefile-cross -+++ b/GNUmakefile-cross -@@ -732,7 +732,7 @@ - $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -- $(LDCONF) $(DESTDIR)$(LIBDIR) -+ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - endif - endif - ifneq ($(wildcard libcryptopp.pc),) diff --git a/dev-libs/cudnn-frontend/Manifest b/dev-libs/cudnn-frontend/Manifest index c0f25eb32adc..efcf66a60000 100644 --- a/dev-libs/cudnn-frontend/Manifest +++ b/dev-libs/cudnn-frontend/Manifest @@ -1,2 +1,3 @@ DIST cudnn-frontend-0.6.2.tar.gz 18658544 BLAKE2B b60e94a58cd414fee1da2b7da8ea83122dedfb59d5db8b987f7d3d42b00d2634c85dabf45fc81e607a6a4f8c2485690294a724ab744ad4025003ab3fd9a69028 SHA512 d0de74ca90771a38d609fc4784372f35c418dfade4b54f1035ee333567560c7c1dd559490e9a6efdf1043cb91ca27d159f31297238ec9d3578532d77ca505e17 DIST cudnn-frontend-0.7.3.tar.gz 18685637 BLAKE2B 77ce32fb84cca43a431c6ad0d7be96f56975369e5f7c2f22e011c895200b92966f0cb48d6f7b01a66d8b89837ed4b955d8bd93a3bcf07ad0b29a247b3d73f6a4 SHA512 bd2fe79404f60975ca40792d373d6a388aad900ac98e42fd4258f4405a0b189641e400b1bd634b38b3376ee1b91a82cf76b152038992cdf83f629e76b3f69f93 +DIST cudnn-frontend-0.9.2.tar.gz 18582081 BLAKE2B d8611231f73f3716bca8c2d851439355121ca2460dd46cf8149632fa53094b7b2a2e9d6840dfcd2c1da113f8b6f06c15559c90c6c5333b36d5c29bd9997733e1 SHA512 0cc326e8395183ab3bc2d90a2155a80318daa9c1d6b30522efc42716bd7000ba036d802a8080a1a6a1f3c017a514f2bed936df57a7cab92c8fcd0136f4312912 diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-0.9.2.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-0.9.2.ebuild new file mode 100644 index 000000000000..0ad71cab6763 --- /dev/null +++ b/dev-libs/cudnn-frontend/cudnn-frontend-0.9.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A c++ wrapper for the cudnn backend API" +HOMEPAGE="https://github.com/NVIDIA/cudnn-frontend" +SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/8" +KEYWORDS="~amd64" + +RDEPEND="=dev-libs/cudnn-8*" +DEPEND="${RDEPEND}" + +src_install() { + insinto /opt/cuda/targets/x86_64-linux + doins -r include +} diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest index e40698740823..9c34802ba57a 100644 --- a/dev-libs/cudnn/Manifest +++ b/dev-libs/cudnn/Manifest @@ -1 +1,2 @@ DIST cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz 864470696 BLAKE2B e842f5861653f2bc8509cc654e5c40436556786610fbc4ab40781cd8246d5bc94e3e3fae0b0933c947941dc0b6eacbd44d6a54702566e5aefcff56df3f884149 SHA512 15d86b8884bf7b48b4aa1022ea26f0965dd50a9911ca1e6fb89e5266181e662547ba077b2e2e9f19bd135aef9d21fb0a3348b97c7fac9059bb241657046d6d60 +DIST cudnn-linux-x86_64-8.8.0.121_cuda12-archive.tar.xz 871089052 BLAKE2B 48f4142d7fea4192e4a910807fa7344c75372aa0d4a68e020416de960eb4b344262551e374b26cdd323751c3c75a000c63a326ece6f801a6ddfbfe06fe51ee6c SHA512 ffdbc1ca4fb03c6906b6896763790ca288aba098e50ed2fbf33a2b994a09386bc6fb5ec9a3a49a82be494331f43c85e22fa406575c4fddb30246f32ee85660e7 diff --git a/dev-libs/cudnn/cudnn-8.8.0.121.ebuild b/dev-libs/cudnn/cudnn-8.8.0.121.ebuild new file mode 100644 index 000000000000..8cd14f1c16a4 --- /dev/null +++ b/dev-libs/cudnn/cudnn-8.8.0.121.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +BASE_V="$(ver_cut 0-3)" +# supports 12.x but URL has a specific version number +CUDA_MA="12" +CUDA_MI="8" +CUDA_V="${CUDA_MA}.${CUDA_MI}" + +DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" +HOMEPAGE="https://developer.nvidia.com/cudnn" +SRC_URI="https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-${PV}_cuda${CUDA_MA}-archive.tar.xz" +S="${WORKDIR}/cudnn-linux-x86_64-${PV}_cuda${CUDA_MA}-archive" + +LICENSE="NVIDIA-cuDNN" +SLOT="0/8" +KEYWORDS="~amd64 ~amd64-linux" +RESTRICT="mirror" + +RDEPEND="=dev-util/nvidia-cuda-toolkit-12*" + +QA_PREBUILT="/opt/cuda/targets/x86_64-linux/lib/*" + +src_install() { + insinto /opt/cuda/targets/x86_64-linux + doins -r include lib +} diff --git a/dev-libs/cutlass/Manifest b/dev-libs/cutlass/Manifest index 5912c749cc75..f05e63478fc7 100644 --- a/dev-libs/cutlass/Manifest +++ b/dev-libs/cutlass/Manifest @@ -1 +1,2 @@ DIST cutlass-2.10.0.tar.gz 15241458 BLAKE2B 66779759ac1c7ebcb860bb9b925a236b45959f5ee3bf4e1f95ffd05a98200dcf2eb4fe2907c02e44143d3f51eca1e2a4ebd890e0edab7fd5378684819123f197 SHA512 4310f8da2931815a63a5e9a69c6c073f95148efecbea7026afcd90965dbd2e1921db52b0ac2a06cda64e20bbaa44112ae1fb7c3b557c41416d99dac33d000aa7 +DIST cutlass-3.1.0.tar.gz 20499454 BLAKE2B 2ece61530e63baebbe3f01d707fed3cb42dadd5dd9a4d1fe8ff70bb60a8dc93719bd19936eb138b01d26ed1db984e109a7a3ab148f8aceea0fae17151f0a5bee SHA512 35224845ddbd9d898f53299fc76ef4bc090d09f62da85cb7a2033f985d8fbb638ac475cdb8eacaf9045adbf1aa7528de4dcaedfdd68b5e32aa689987bcff33d9 diff --git a/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild b/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild index 0a0c63b2dd1c..d85941a8c5e4 100644 --- a/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild +++ b/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild @@ -14,8 +14,6 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -DEPEND="" -RDEPEND="${DEPEND}" BDEPEND="dev-util/nvidia-cuda-toolkit" src_prepare() { @@ -36,5 +34,5 @@ src_configure() { src_install() { cmake_src_install - rm -r "${D}"/usr/test || die + rm -r "${ED}"/usr/test || die } diff --git a/dev-libs/cutlass/cutlass-3.1.0.ebuild b/dev-libs/cutlass/cutlass-3.1.0.ebuild new file mode 100644 index 000000000000..d85941a8c5e4 --- /dev/null +++ b/dev-libs/cutlass/cutlass-3.1.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cuda cmake + +DESCRIPTION="CUDA Templates for Linear Algebra Subroutines" +HOMEPAGE="https://github.com/NVIDIA/cutlass" +SRC_URI="https://github.com/NVIDIA/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-util/nvidia-cuda-toolkit" + +src_prepare() { + cmake_src_prepare + cuda_src_prepare +} + +src_configure() { + mycmakeargs+=( + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + -DCUTLASS_ENABLE_HEADERS_ONLY=yes + -DCUTLASS_ENABLE_TESTS=no + ) + cuda_add_sandbox -w + addpredict /dev/char + cmake_src_configure +} + +src_install() { + cmake_src_install + rm -r "${ED}"/usr/test || die +} diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index bfa6547d559e..e6f246ba2943 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -1,3 +1,2 @@ -DIST cyrus-sasl-2.1.27-r6-patches.tar.bz2 5169 BLAKE2B 43a2f0db4a8589ec1cde7807b31a93459eacb04d27ba36751a69dd5f4e669d1b28342194b0e1a5382e281a52a35e88168877b54065cfba01b9bd33e87fbd23f1 SHA512 41c4ca7c8f7b79e03faf5d826a6ff0ed398137239b93fb0046ccbf385f6ddeab2b9fb2f51d7a263dc74626e5fdbefb28615a1ee22aabe57ed57f10a52d382797 DIST cyrus-sasl-2.1.28-r3-patches.tar.xz 4244 BLAKE2B 113da9bb58cce3643269fca88ea8d700aa20226d9536427c9068ef7b43499c2b78cbcb233d8db2418d84136c7edd629cc05f52b31cdfddfcb529f9a9fcb4effb SHA512 0cccbb27646dc118fbeea64b0cb688f312df97b31fced8c18d5230764cd5e2f0d48806bd2f5524aeddd02e8933cd835fb6f67dd3fbc1b0abfd1a3e1f0f53cf8a DIST cyrus-sasl-2.1.28.tar.gz 4034803 BLAKE2B 6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823 SHA512 db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78 diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild deleted file mode 100644 index 38733ce427bc..000000000000 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edos2unix flag-o-matic multilib multilib-minimal pam db-use systemd toolchain-funcs tmpfiles - -SASLAUTHD_CONF_VER="2.1.26" -MY_PATCH_VER="${PN}-2.1.27-r6-patches" -DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" -HOMEPAGE="https://www.cyrusimap.org/sasl/" -#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" -SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VER}.tar.bz2" - -LICENSE="BSD-with-attribution" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" -REQUIRED_USE="ldapdb? ( openldap )" - -DEPEND="net-mail/mailbase - virtual/libcrypt:= - authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) - berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) - gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] ) - mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] ) - pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] ) - ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-sasl )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/sasl/md5global.h -) - -PATCHES=( - "${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.25-auxprop.patch - "${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch - "${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch - "${FILESDIR}"/cyrus-sasl-2.1.28-fix-configure-time-check.patch -) - -src_prepare() { - default - - # Use plugindir for sasldir - # https://github.com/cyrusimap/cyrus-sasl/issues/339 (I think) - sed -i '/^sasldir =/s:=.*:= $(plugindir):' \ - "${S}"/plugins/Makefile.{am,in} || die "sed failed" - - # bug #486740 and bug #468556 (dropped AM_CONFIG_HEADER sed in 2.1.28) - sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' configure.ac || die - - eautoreconf -} - -src_configure() { - export CC_FOR_BUILD="$(tc-getBUILD_CC)" - - append-flags -fno-strict-aliasing - - if [[ ${CHOST} == *-solaris* ]] ; then - # getpassphrase is defined in /usr/include/stdlib.h - append-cppflags -DHAVE_GETPASSPHRASE - else - # this horrendously breaks things on Solaris - append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED - # replaces BSD_SOURCE (bug #579218) - append-cppflags -D_DEFAULT_SOURCE - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --enable-login - --enable-ntlm - --enable-auth-sasldb - --disable-cmulocal - --disable-krb4 - --disable-macos-framework - --enable-otp - --without-sqlite - --with-saslauthd="${EPREFIX}"/run/saslauthd - --with-pwcheck="${EPREFIX}"/run/saslauthd - --with-configdir="${EPREFIX}"/etc/sasl2 - --with-plugindir="${EPREFIX}/usr/$(get_libdir)/sasl2" - --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2 - --with-sphinx-build=no - $(use_with ssl openssl) - $(use_with pam) - $(use_with openldap ldap) - $(use_enable ldapdb) - $(multilib_native_use_enable sample) - $(use_enable kerberos gssapi) - $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) - $(multilib_native_use_with postgres pgsql "${EPREFIX}/usr/$(get_libdir)/postgresql") - $(use_with sqlite sqlite3 "${EPREFIX}/usr/$(get_libdir)") - $(use_enable srp) - $(use_enable static-libs static) - - # Add authdaemond support (bug #56523). - $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '') - - # Fix for bug #59634. - $(usex ssl '' --without-des) - - # Use /dev/urandom instead of /dev/random (bug #46038). - $(usex urandom --with-devrandom=/dev/urandom '') - ) - - if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then - myeconfargs+=( --enable-sql ) - else - myeconfargs+=( --disable-sql ) - fi - - # Default to GDBM if both 'gdbm' and 'berkdb' are present. - if use gdbm ; then - einfo "Building with GNU DB as database backend for your SASLdb" - myeconfargs+=( --with-dblib=gdbm ) - elif use berkdb ; then - einfo "Building with BerkeleyDB as database backend for your SASLdb" - myeconfargs+=( - --with-dblib=berkeley - --with-bdb-incdir="$(db_includedir)" - ) - else - einfo "Building without SASLdb support" - myeconfargs+=( --with-dblib=none ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - if use sample ; then - docinto sample - dodoc "${S}"/sample/*.c - exeinto /usr/share/doc/${P}/sample - doexe sample/client sample/server - fi - - dosbin saslauthd/testsaslauthd - fi -} - -multilib_src_install_all() { - doman man/* - - keepdir /etc/sasl2 - - # Reset docinto to default value (bug #674296) - docinto - dodoc AUTHORS ChangeLog doc/legacy/TODO - newdoc pwcheck/README README.pwcheck - - newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes - edos2unix "${ED}"/usr/share/doc/${PF}/release-notes - - docinto html - dodoc doc/html/*.html - - if use pam; then - newpamd "${FILESDIR}"/saslauthd.pam-include saslauthd - fi - - newinitd "${FILESDIR}"/pwcheck.rc6 pwcheck - systemd_dounit "${FILESDIR}"/pwcheck.service - - newinitd "${FILESDIR}"/saslauthd2.rc7 saslauthd - newconfd "${FILESDIR}"/saslauthd-${SASLAUTHD_CONF_VER}.conf saslauthd - systemd_dounit "${FILESDIR}"/saslauthd.service - dotmpfiles "${FILESDIR}"/${PN}.conf - - # The get_modname bit is important: do not remove the .la files on - # platforms where the lib isn't called .so for cyrus searches the .la to - # figure out what the name is supposed to be instead - if ! use static-libs && [[ $(get_modname) == .so ]] ; then - find "${ED}" -name "*.la" -delete || die - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf - - # Generate an empty sasldb2 with correct permissions. - if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then - einfo "Generating an empty sasldb2 with correct permissions ..." - - echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \ - || die "Failed to generate sasldb2" - - "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \ - || die "Failed to delete temp user" - - chown root:mail "${EROOT}/etc/sasl2/sasldb2" \ - || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2" - chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \ - || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2" - fi - - if use authdaemond ; then - elog "You need to add a user running a service using Courier's" - elog "authdaemon to the 'mail' group. For example, do:" - elog " gpasswd -a postfix mail" - elog "to add the 'postfix' user to the 'mail' group." - fi - - elog "pwcheck and saslauthd home directories have moved to:" - elog " /run/saslauthd, using tmpfiles.d" -} diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild deleted file mode 100644 index 2c1eac083d19..000000000000 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edos2unix flag-o-matic multilib multilib-minimal pam db-use systemd toolchain-funcs tmpfiles - -SASLAUTHD_CONF_VER="2.1.26" -MY_PATCH_VER="${PN}-2.1.28-r3-patches" -DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" -HOMEPAGE="https://www.cyrusimap.org/sasl/" -#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" -SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VER}.tar.xz" - -LICENSE="BSD-with-attribution" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" -REQUIRED_USE="ldapdb? ( openldap )" - -DEPEND="net-mail/mailbase - virtual/libcrypt:= - authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) - berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) - gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] ) - mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] ) - pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] ) - ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-sasl )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/sasl/md5global.h -) - -PATCHES=( - "${WORKDIR}"/${MY_PATCH_VER}/ -) - -src_prepare() { - default - - # Use plugindir for sasldir - # https://github.com/cyrusimap/cyrus-sasl/issues/339 (I think) - sed -i '/^sasldir =/s:=.*:= $(plugindir):' \ - "${S}"/plugins/Makefile.{am,in} || die "sed failed" - - # bug #486740 and bug #468556 (dropped AM_CONFIG_HEADER sed in 2.1.28) - sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' configure.ac || die - - eautoreconf -} - -src_configure() { - export CC_FOR_BUILD="$(tc-getBUILD_CC)" - - append-flags -fno-strict-aliasing - - if [[ ${CHOST} == *-solaris* ]] ; then - # getpassphrase is defined in /usr/include/stdlib.h - append-cppflags -DHAVE_GETPASSPHRASE - else - # this horrendously breaks things on Solaris - append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED - # replaces BSD_SOURCE (bug #579218) - append-cppflags -D_DEFAULT_SOURCE - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --enable-login - --enable-ntlm - --enable-auth-sasldb - --disable-cmulocal - --disable-krb4 - --disable-macos-framework - --enable-otp - --without-sqlite - --with-saslauthd="${EPREFIX}"/run/saslauthd - --with-pwcheck="${EPREFIX}"/run/saslauthd - --with-configdir="${EPREFIX}"/etc/sasl2 - --with-plugindir="${EPREFIX}/usr/$(get_libdir)/sasl2" - --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2 - --with-sphinx-build=no - $(use_with ssl openssl) - $(use_with pam) - $(use_with openldap ldap) - $(use_enable ldapdb) - $(multilib_native_use_enable sample) - $(use_enable kerberos gssapi) - $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) - $(multilib_native_use_with postgres pgsql "${EPREFIX}/usr/$(get_libdir)/postgresql") - $(use_with sqlite sqlite3 "${EPREFIX}/usr/$(get_libdir)") - $(use_enable srp) - $(use_enable static-libs static) - - # Add authdaemond support (bug #56523). - $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '') - - # Fix for bug #59634. - $(usex ssl '' --without-des) - - # Use /dev/urandom instead of /dev/random (bug #46038). - $(usex urandom --with-devrandom=/dev/urandom '') - ) - - if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then - myeconfargs+=( --enable-sql ) - else - myeconfargs+=( --disable-sql ) - fi - - # Default to GDBM if both 'gdbm' and 'berkdb' are present. - if use gdbm ; then - einfo "Building with GNU DB as database backend for your SASLdb" - myeconfargs+=( --with-dblib=gdbm ) - elif use berkdb ; then - einfo "Building with BerkeleyDB as database backend for your SASLdb" - myeconfargs+=( - --with-dblib=berkeley - --with-bdb-incdir="$(db_includedir)" - ) - else - einfo "Building without SASLdb support" - myeconfargs+=( --with-dblib=none ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - if use sample ; then - docinto sample - dodoc "${S}"/sample/*.c - exeinto /usr/share/doc/${P}/sample - doexe sample/client sample/server - fi - - dosbin saslauthd/testsaslauthd - fi -} - -multilib_src_install_all() { - doman man/* - - keepdir /etc/sasl2 - - # Reset docinto to default value (bug #674296) - docinto - dodoc AUTHORS ChangeLog doc/legacy/TODO - newdoc pwcheck/README README.pwcheck - - newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes - edos2unix "${ED}"/usr/share/doc/${PF}/release-notes - - docinto html - dodoc doc/html/*.html - - if use pam; then - newpamd "${FILESDIR}"/saslauthd.pam-include saslauthd - fi - - newinitd "${FILESDIR}"/pwcheck.rc6 pwcheck - systemd_dounit "${FILESDIR}"/pwcheck.service - - newinitd "${FILESDIR}"/saslauthd2.rc7 saslauthd - newconfd "${FILESDIR}"/saslauthd-${SASLAUTHD_CONF_VER}.conf saslauthd - systemd_dounit "${FILESDIR}"/saslauthd.service - dotmpfiles "${FILESDIR}"/${PN}.conf - - # The get_modname bit is important: do not remove the .la files on - # platforms where the lib isn't called .so for cyrus searches the .la to - # figure out what the name is supposed to be instead - if ! use static-libs && [[ $(get_modname) == .so ]] ; then - find "${ED}" -name "*.la" -delete || die - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf - - # Generate an empty sasldb2 with correct permissions. - if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then - einfo "Generating an empty sasldb2 with correct permissions ..." - - echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \ - || die "Failed to generate sasldb2" - - "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \ - || die "Failed to delete temp user" - - chown root:mail "${EROOT}/etc/sasl2/sasldb2" \ - || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2" - chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \ - || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2" - fi - - if use authdaemond ; then - elog "You need to add a user running a service using Courier's" - elog "authdaemon to the 'mail' group. For example, do:" - elog " gpasswd -a postfix mail" - elog "to add the 'postfix' user to the 'mail' group." - fi - - elog "pwcheck and saslauthd home directories have moved to:" - elog " /run/saslauthd, using tmpfiles.d" -} diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild index ee2f875f1404..14ebb5120992 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VE LICENSE="BSD-with-attribution" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" REQUIRED_USE="ldapdb? ( openldap )" diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch deleted file mode 100644 index 873dac53fe03..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/cyrusimap/cyrus-sasl/pull/709 - -From 399625c3413c313e93432d0f5907350722b861c7 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Wed, 23 Feb 2022 00:45:15 +0000 -Subject: [PATCH] Fix <time.h> check -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We're conditionally including based on HAVE_TIME_H in a bunch of places, -but we're not actually checking for time.h, so that's never going to be defined. - -While at it, add in a missing include in the cram plugin. - -This fixes a bunch of implicit declaration warnings: -``` - * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] - * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration] - * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] - * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] - * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration] - * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] -``` - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h]) - - AC_HEADER_DIRENT - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h) -+AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h) - - IPv6_CHECK_SS_FAMILY() - IPv6_CHECK_SA_LEN() ---- a/plugins/cram.c -+++ b/plugins/cram.c -@@ -53,6 +53,10 @@ - #endif - #include <fcntl.h> - -+#ifdef HAVE_TIME_H -+#include <time.h> -+#endif -+ - #include <sasl.h> - #include <saslplug.h> - #include <saslutil.h> diff --git a/dev-libs/date/date-3.0.0.ebuild b/dev-libs/date/date-3.0.0.ebuild index d77a0ca0a183..d0a19a986f6b 100644 --- a/dev-libs/date/date-3.0.0.ebuild +++ b/dev-libs/date/date-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="A date and time library based on the C++11/14/17 <chrono> header" HOMEPAGE="https://github.com/HowardHinnant/date" SRC_URI="https://github.com/HowardHinnant/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" +KEYWORDS="amd64" LICENSE="MIT" SLOT="0/3.0.0" diff --git a/dev-libs/double-conversion/double-conversion-3.2.1.ebuild b/dev-libs/double-conversion/double-conversion-3.2.1.ebuild index 261a9d8b1800..b20b805cabb1 100644 --- a/dev-libs/double-conversion/double-conversion-3.2.1.ebuild +++ b/dev-libs/double-conversion/double-conversion-3.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest index 7f512103afb5..86f3b2c832d5 100644 --- a/dev-libs/dqlite/Manifest +++ b/dev-libs/dqlite/Manifest @@ -1 +1 @@ -DIST dqlite-1.14.0.tar.gz 190757 BLAKE2B 5304ff10134c7775c4475f77bbe60cc6892cc35c3f2a7b4813743cd27fc1176a1d513d66ebf22b47ed7e83fa833be1408f44f781fbd8200bfd3f4465ea1d6011 SHA512 4305b289903766f00c26e278cce3f761c778b67105a6d7e51e66cc1cbf85564fd41f27689b6895c6f182968d851e10a40d052570d55e22007e9eb5c2929dabd9 +DIST dqlite-1.16.0.tar.gz 216776 BLAKE2B 653eac56c237e466f8b57d43a62ad25b7b3bd72a2088345f66db53b6bce5cdd528d16f3440572e5af8536fafde3f3cbb7700898479f1cd62b273e2192160ad15 SHA512 f9bc7ea3021d72bd81fe487d1c11b86a566002e2b1ddf6000b0fd54e407746ac35af079afc508d9d752de774dfee33c5c6e54c40c7884ac67a3bc7dca14ea362 diff --git a/dev-libs/dqlite/dqlite-1.14.0.ebuild b/dev-libs/dqlite/dqlite-1.16.0.ebuild index 2c927cf8dd44..7a76fcbeee18 100644 --- a/dev-libs/dqlite/dqlite-1.14.0.ebuild +++ b/dev-libs/dqlite/dqlite-1.16.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite" SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-3-with-linking-exception" -SLOT="0/1.12.0" +SLOT="0/1.15.1" KEYWORDS="amd64 ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -19,7 +19,7 @@ RDEPEND="dev-db/sqlite:3 dev-libs/libuv:= >=dev-libs/raft-0.17.1:=" DEPEND="${RDEPEND} - test? ( >=dev-libs/raft-0.13.0[lz4,test] )" + test? ( dev-libs/raft[lz4,test] )" BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/dqlite-1.12.0-disable-werror.patch ) diff --git a/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild b/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild index 310c54534389..504d5165d857 100644 --- a/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild +++ b/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) VALA_USE_DEPEND="vapigen" inherit autotools gnome2-utils python-any-r1 vala vcs-snapshot virtualx xdg diff --git a/dev-libs/efl/efl-1.26.3-r1.ebuild b/dev-libs/efl/efl-1.26.3-r2.ebuild index fb26d694f9b3..0e1e9b566be1 100644 --- a/dev-libs/efl/efl-1.26.3-r1.ebuild +++ b/dev-libs/efl/efl-1.26.3-r2.ebuild @@ -10,7 +10,7 @@ DOCS_DIR="${S}/doc" LUA_REQ_USE="deprecated(+)" LUA_COMPAT=( lua5-{1,2} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit docs lua-single meson python-any-r1 xdg @@ -101,7 +101,7 @@ RDEPEND="${LUA_DEPS} pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) @@ -128,11 +128,13 @@ DEPEND="${RDEPEND} wayland? ( dev-libs/wayland-protocols )" BDEPEND="${PYTHON_DEPS} virtual/pkgconfig + examples? ( sys-devel/gettext ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner )" PATCHES=( "${FILESDIR}"/${PN}-1.26.3-libressl.patch #903001 + "${FILESDIR}"/efl-1.26.3-gettext-0.22-fix.patch ) pkg_setup() { diff --git a/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch b/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch new file mode 100644 index 000000000000..1bce74f76fec --- /dev/null +++ b/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch @@ -0,0 +1,38 @@ +From 155842cf9e726009e9eb4ec04d8a176cd990fdcb Mon Sep 17 00:00:00 2001 +From: dimmus <dmitri.chudinov@gmail.com> +Date: Mon, 14 Aug 2023 21:39:05 +0500 +Subject: [PATCH] examples: edje - add charset header to po files. + +Solved compilation error with novel gettext-0.22. +@fix +--- + src/examples/edje/en_IN/domain_name.po | 5 +++++ + src/examples/edje/hi_IN/domain_name.po | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/src/examples/edje/en_IN/domain_name.po b/src/examples/edje/en_IN/domain_name.po +index f461123404..131579ee36 100644 +--- a/src/examples/edje/en_IN/domain_name.po ++++ b/src/examples/edje/en_IN/domain_name.po +@@ -1,3 +1,8 @@ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: UTF-8\n" ++ + msgid "LOADING" + msgstr "Loading..." + +diff --git a/src/examples/edje/hi_IN/domain_name.po b/src/examples/edje/hi_IN/domain_name.po +index 809cf6f399..fcb0e85d00 100644 +--- a/src/examples/edje/hi_IN/domain_name.po ++++ b/src/examples/edje/hi_IN/domain_name.po +@@ -1,3 +1,8 @@ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: UTF-8\n" ++ + msgid "LOADING" + msgstr "लोड हो रहा है..." + diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml index 44684ed64be4..2a3d3a291099 100644 --- a/dev-libs/efl/metadata.xml +++ b/dev-libs/efl/metadata.xml @@ -6,7 +6,6 @@ <name>Joonas Niilola</name> </maintainer> <use> - <flag name="avif">Enable AVIF image loader</flag> <flag name="bmp">Enable WBMP image loader</flag> <flag name="dds">Enable DDS image loader</flag> <flag name="drm">Enable DRM engine</flag> diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index 1b799318d833..66c4bb18aecd 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -1,5 +1,4 @@ -DIST elfutils-0.187-patches.tar.xz 2804 BLAKE2B 77cbd0666d8da3d5229baaba6605c84e7990200f39bfb72b2008eb2527e4567abd90c93c291cc0c8f3c10bbf97758ccf5877cbdae823780cf8dc97ff4ff2f932 SHA512 d056fdd6ae0e71471087af472a72384d6e73ff2d7fe1b708b5ec9f091a913c8327197660132b7a6619a0db86534715507ef67ee91691a00a591c1d24c55a99f4 -DIST elfutils-0.188.tar.bz2 9112977 BLAKE2B 6b0474f1436eaf6af73b735b9b2ddd5448ab9c03fbaa0be745a31c89ae8f15b0e21a651409c38643ca125794ce82c19d7b46db4a079f3e72cb919d643560e7a4 SHA512 585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5 -DIST elfutils-0.188.tar.bz2.sig 310 BLAKE2B c8d9135cffde3b1dd337b692d5351855cf799915d3ebd553327febaac192bd2f108b3f45a6376d458e179390a1ceaf4809762cdc40ea1e05fed0214ac33ed56e SHA512 4cc8a7417d244e319a1650d71b1831660cfe41afc7c73e9c83d1f076f4013fe15247e8b4f5e12a5396d83c4f1c7663ca4be5ea42bff3dc23263f85331fd9d566 DIST elfutils-0.189.tar.bz2 9143169 BLAKE2B 30596271e14cf3408326abc38a9775b849b8cb0ee119a5455df9434a7d3b9a57afb15e0236a179a26c7bd400d303749964c9d6350c419f747784fd99d12517e0 SHA512 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71 DIST elfutils-0.189.tar.bz2.sig 310 BLAKE2B d4155de64b15a9ab5c497cd603e73bf918eb1117de36cf28f8ddb50ccb4874fb24cffdf44bcbbc028b2ef3f64562960bf11a431274d861f9db96e3d865b37ec2 SHA512 2016c5f0ccd16f7feb0c825164bb18b2f1afad17dcd39d9f159429360fe4afd645665f612397d48bde191a1e59bb8352e2d065d61d7f649b929c3a7e7bfe8dd0 +DIST elfutils-0.190.tar.bz2 9162766 BLAKE2B 9934aff08f1898377708b28595fb52130ef9f80408132ac7d306845b10672ba45cf1ac69783da07b3eea9fd647741d44da45b8b2626c45a768cb2844c6186513 SHA512 9c4f5328097e028286c42f29e39dc3d80914b656cdfbbe05b639e91bc787ae8ae64dd4d69a6e317ce30c01648ded10281b86a51e718295f4c589df1225a48102 +DIST elfutils-0.190.tar.bz2.sig 310 BLAKE2B d6a2d490aa6815ed9a7c3624050716ebf7c50465af9907d471d47aa3b57590faf9b9ee03de127c6b3bdffa6948414aab6aa8c784ce29570f76bb03ee2021c062 SHA512 7cd88c19402a959679204a5b01ddd48720e224b84268d0d7452f0f1433150b97dd02288fac204fbd5e2fd6f227473bfe62205b350d5fe2e17addf45fb452eed6 diff --git a/dev-libs/elfutils/elfutils-0.189-r1.ebuild b/dev-libs/elfutils/elfutils-0.189-r4.ebuild index 8add6ad1cb00..4fbcbbab5b6d 100644 --- a/dev-libs/elfutils/elfutils-0.189-r1.ebuild +++ b/dev-libs/elfutils/elfutils-0.189-r4.ebuild @@ -3,25 +3,31 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg inherit autotools flag-o-matic multilib-minimal verify-sig DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" HOMEPAGE="https://sourceware.org/elfutils/" SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.187-patches.tar.xz" SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 lzma nls static-libs test +utils zstd" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd" RESTRICT="!test? ( test )" RDEPEND=" !dev-libs/libelf >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + debuginfod? ( + app-arch/libarchive:= + dev-db/sqlite:3= + net-libs/libmicrohttpd:= + + net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) elibc_musl? ( @@ -37,32 +43,25 @@ DEPEND=" BDEPEND=" >=sys-devel/flex-2.5.4a sys-devel/m4 + virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-elfutils ) " PATCHES=( - "${WORKDIR}"/${PN}-0.187-patches/ + "${FILESDIR}"/${PN}-0.189-PaX-support.patch + "${FILESDIR}"/${PN}-0.189-skip-DT_RELR-failing-tests.patch + "${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch + "${FILESDIR}"/${PN}-0.189-musl-macros.patch "${FILESDIR}"/${P}-configure-bashisms.patch "${FILESDIR}"/${P}-clang16-tests.patch + "${FILESDIR}"/${P}-tests-run-lfs-symbols.sh-needs-gawk.patch + "${FILESDIR}"/${P}-lld-17.patch ) -src_unpack() { - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig} - fi - - default -} - src_prepare() { default - if use elibc_musl; then - eapply "${WORKDIR}"/${PN}-0.187-patches/musl/ - fi - # Only here for ${P}-configure-bashisms.patch, delete on next bump! eautoreconf @@ -78,9 +77,8 @@ src_configure() { # bug #407135 use test && append-flags -g - # Symbol aliases are implemented as asm statements. - # Will require porting: https://gcc.gnu.org/PR48200 - filter-flags '-flto*' + # bug 660738 + filter-flags -fno-asynchronous-unwind-tables multilib-minimal_src_configure } @@ -88,8 +86,8 @@ src_configure() { multilib_src_configure() { local myeconfargs=( $(use_enable nls) - --disable-debuginfod - --disable-libdebuginfod + $(multilib_native_use_enable debuginfod) + $(use_enable debuginfod libdebuginfod) # explicitly disable thread safety, it's not recommended by upstream # doesn't build either on musl. diff --git a/dev-libs/elfutils/elfutils-0.188.ebuild b/dev-libs/elfutils/elfutils-0.190.ebuild index adfff3be54dc..857fb2fd495e 100644 --- a/dev-libs/elfutils/elfutils-0.188.ebuild +++ b/dev-libs/elfutils/elfutils-0.190.ebuild @@ -3,25 +3,31 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg inherit flag-o-matic multilib-minimal verify-sig DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" HOMEPAGE="https://sourceware.org/elfutils/" SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.187-patches.tar.xz" SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 lzma nls static-libs test +utils zstd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd" RESTRICT="!test? ( test )" RDEPEND=" !dev-libs/libelf >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + debuginfod? ( + app-arch/libarchive:= + dev-db/sqlite:3= + net-libs/libmicrohttpd:= + + net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) elibc_musl? ( @@ -37,30 +43,19 @@ DEPEND=" BDEPEND=" >=sys-devel/flex-2.5.4a sys-devel/m4 + virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-elfutils ) " PATCHES=( - "${WORKDIR}"/${PN}-0.187-patches/ + "${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch + "${FILESDIR}"/${PN}-0.189-musl-macros.patch ) -src_unpack() { - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig} - fi - - default -} - src_prepare() { default - if use elibc_musl; then - eapply "${WORKDIR}"/${PN}-0.187-patches/musl/ - fi - if ! use static-libs; then sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die fi @@ -73,9 +68,8 @@ src_configure() { # bug #407135 use test && append-flags -g - # Symbol aliases are implemented as asm statements. - # Will require porting: https://gcc.gnu.org/PR48200 - filter-flags '-flto*' + # bug 660738 + filter-flags -fno-asynchronous-unwind-tables multilib-minimal_src_configure } @@ -83,8 +77,8 @@ src_configure() { multilib_src_configure() { local myeconfargs=( $(use_enable nls) - --disable-debuginfod - --disable-libdebuginfod + $(multilib_native_use_enable debuginfod) + $(use_enable debuginfod libdebuginfod) # explicitly disable thread safety, it's not recommended by upstream # doesn't build either on musl. diff --git a/dev-libs/elfutils/files/elfutils-0.189-PaX-support.patch b/dev-libs/elfutils/files/elfutils-0.189-PaX-support.patch new file mode 100644 index 000000000000..2d44c757711a --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.189-PaX-support.patch @@ -0,0 +1,26 @@ +Add support for PaX ELF markings + +Patch by Kevin F. Quinn <kevquinn@gentoo.org> + +http://bugs.gentoo.org/115100 + +--- a/libelf/elf.h ++++ b/libelf/elf.h +@@ -722,6 +722,7 @@ typedef struct + #define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ + #define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ + #define PT_GNU_PROPERTY 0x6474e553 /* GNU property */ ++#define PT_PAX_FLAGS 0x65041580 /* Indicates PaX flag markings */ + #define PT_LOSUNW 0x6ffffffa + #define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ + #define PT_SUNWSTACK 0x6ffffffb /* Stack segment */ +--- a/src/elflint.c ++++ b/src/elflint.c +@@ -4493,6 +4493,7 @@ only executables, shared objects, and core files can have program headers\n")); + + if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME + && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO ++ && phdr->p_type != PT_PAX_FLAGS + && phdr->p_type != PT_GNU_PROPERTY + /* Check for a known machine-specific type. */ + && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL) diff --git a/dev-libs/elfutils/files/elfutils-0.189-lld-17.patch b/dev-libs/elfutils/files/elfutils-0.189-lld-17.patch new file mode 100644 index 000000000000..3143bc078d77 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.189-lld-17.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/913112 +https://sourceware.org/PR30729 +https://sourceware.org/git/?p=elfutils.git;a=commit;h=09e61a65953ed814d9e970f7f9ffb9c2d8cda477 + +From 09e61a65953ed814d9e970f7f9ffb9c2d8cda477 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard <mark@klomp.org> +Date: Mon, 28 Aug 2023 20:23:41 +0200 +Subject: [PATCH] libelf: Remove elf_scncnt from libelf.map + +elf_scncnt was never implemented. It was probably an old name for +elf_getshnum (which was the deprecated name of the elf_getshdrnum +alias). Just remove it from the map file + + * libelf/libelf.map (ELFUTILS_1.0): Remove elf_scncnt. + +https://sourceware.org/PR30729 + +Reported-by: Kostadin Shishmanov <kocelfc@tutanota.com> +Signed-off-by: Mark Wielaard <mark@klomp.org> +--- a/libelf/libelf.map ++++ b/libelf/libelf.map +@@ -50,7 +50,6 @@ ELFUTILS_1.0 { + elf_rand; + elf_rawdata; + elf_rawfile; +- elf_scncnt; + elf_strptr; + elf_update; + elf_version; +-- +2.39.3 diff --git a/dev-libs/elfutils/files/elfutils-0.189-musl-aarch64-regs.patch b/dev-libs/elfutils/files/elfutils-0.189-musl-aarch64-regs.patch new file mode 100644 index 000000000000..222c0527b689 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.189-musl-aarch64-regs.patch @@ -0,0 +1,57 @@ +https://www.sourceware.org/bugzilla/show_bug.cgi?id=25832 +https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch +https://bugs.gentoo.org/693772 + +Other variants/links: +https://git.alpinelinux.org/aports/tree/main/elfutils/fix-aarch64_fregs.patch +https://github.com/gentoo/musl/blob/6450482b9b4463b57ac249c63b7ed796e9874c40/dev-libs/elfutils/files/0.178/fix-aarch64_fregs.patch + +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 15 Aug 2017 17:27:30 +0800 +Subject: [PATCH] Fix build on aarch64/musl + +Errors + +invalid operands to binary & (have 'long double' and 'unsigned int') + +error: redefinition + of 'struct iovec' + struct iovec { void *iov_base; size_t iov_len; }; + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Rebase to 0.170 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +--- a/backends/aarch64_initreg.c ++++ b/backends/aarch64_initreg.c +@@ -33,7 +33,7 @@ + #include "system.h" + #include <assert.h> + #if defined(__aarch64__) && defined(__linux__) +-# include <linux/uio.h> ++# include <sys/uio.h> + # include <sys/user.h> + # include <sys/ptrace.h> + /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ +@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), + + Dwarf_Word dwarf_fregs[32]; + for (int r = 0; r < 32; r++) +- dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF; ++ dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0xFFFFFFFF; + + if (! setfunc (64, 32, dwarf_fregs, arg)) + return false; +--- a/backends/arm_initreg.c ++++ b/backends/arm_initreg.c +@@ -38,7 +38,7 @@ + #endif + + #ifdef __aarch64__ +-# include <linux/uio.h> ++# include <sys/uio.h> + # include <sys/user.h> + # include <sys/ptrace.h> + /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ diff --git a/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch b/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch new file mode 100644 index 000000000000..97c6c1dcd62e --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch @@ -0,0 +1,86 @@ +May not be required (or at least some hunks) with next release (0.186?) + +https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch +--- a/lib/libeu.h ++++ b/lib/libeu.h +@@ -31,6 +31,27 @@ + + #include <stddef.h> + #include <stdint.h> ++#include <unistd.h> ++#include <alloca.h> ++#include <string.h> ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ ++#ifndef strndupa ++#define strndupa(s, n) \ ++ (__extension__ ({const char *__in = (s); \ ++ size_t __len = strnlen (__in, (n)) + 1; \ ++ char *__out = (char *) alloca (__len); \ ++ __out[__len-1] = '\0'; \ ++ (char *) memcpy (__out, __in, __len-1);})) ++#endif + + extern void *xmalloc (size_t) __attribute__ ((__malloc__)); + extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__)); +--- a/src/arlib.h ++++ b/src/arlib.h +@@ -29,6 +29,16 @@ + #include <stdint.h> + #include <sys/types.h> + ++#if !defined(ACCESSPERMS) ++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++#if !defined(ALLPERMS) ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ ++#endif ++#if !defined(DEFFILEMODE) ++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ ++#endif ++ + + /* State of -D/-U flags. */ + extern bool arlib_deterministic_output; +--- a/src/elfcompress.c ++++ b/src/elfcompress.c +@@ -37,6 +37,14 @@ + #include "libeu.h" + #include "printversion.h" + ++#if !defined(FNM_EXTMATCH) ++# define FNM_EXTMATCH 0 ++#endif ++ ++#if !defined(ALLPERMS) ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ ++#endif ++ + /* Name and version of program. */ + ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; + +--- a/src/strip.c ++++ b/src/strip.c +@@ -45,6 +45,14 @@ + #include <system.h> + #include <printversion.h> + ++#if !defined(FNM_EXTMATCH) ++# define FNM_EXTMATCH 0 ++#endif ++ ++#if !defined(ACCESSPERMS) ++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) ++#endif ++ + typedef uint8_t GElf_Byte; + + /* Name and version of program. */ diff --git a/dev-libs/elfutils/files/elfutils-0.189-skip-DT_RELR-failing-tests.patch b/dev-libs/elfutils/files/elfutils-0.189-skip-DT_RELR-failing-tests.patch new file mode 100644 index 000000000000..0ffe75d93d31 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.189-skip-DT_RELR-failing-tests.patch @@ -0,0 +1,39 @@ +We know these tests fail with DT_RELR (https://sourceware.org/bugzilla/show_bug.cgi?id=28495) +so skip for now. +--- a/tests/run-elflint-self.sh ++++ b/tests/run-elflint-self.sh +@@ -18,5 +18,8 @@ + + . $srcdir/test-subr.sh + ++# XFAIL b/c no DT_RELR support yet (https://sourceware.org/bugzilla/show_bug.cgi?id=28495) ++exit 77 ++ + testrun_on_self ${abs_top_builddir}/src/elflint --quiet --gnu-ld + testrun_on_self_compressed ${abs_top_builddir}/src/elflint --quiet --gnu-ld +--- a/tests/run-strip-strmerge.sh ++++ b/tests/run-strip-strmerge.sh +@@ -17,6 +17,9 @@ + + . $srcdir/test-subr.sh + ++# XFAIL b/c no DT_RELR support yet (https://sourceware.org/bugzilla/show_bug.cgi?id=28495) ++exit 77 ++ + # Generate a file with merged .shstrtab/.strtab table. + # strip and unstrip it. Check all files with elflint. + +diff --git a/tests/run-reverse-sections-self.sh b/tests/run-reverse-sections-self.sh +index 71afd6a..87de933 100755 +--- a/tests/run-reverse-sections-self.sh ++++ b/tests/run-reverse-sections-self.sh +@@ -17,6 +17,9 @@ + + . $srcdir/test-subr.sh + ++# XFAIL b/c no DT_RELR support yet (https://sourceware.org/bugzilla/show_bug.cgi?id=28495) ++exit 77 ++ + test_reverse_self () + { + in_file="$1" diff --git a/dev-libs/elfutils/files/elfutils-0.189-tests-run-lfs-symbols.sh-needs-gawk.patch b/dev-libs/elfutils/files/elfutils-0.189-tests-run-lfs-symbols.sh-needs-gawk.patch new file mode 100644 index 000000000000..c64a30ec03b6 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.189-tests-run-lfs-symbols.sh-needs-gawk.patch @@ -0,0 +1,41 @@ +https://inbox.sourceware.org/elfutils-devel/20230719231639.1786109-1-sam@gentoo.org/T/#u + +From 7f607f9aba5c6fccb3d94776452b1cfa421df1f7 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 20 Jul 2023 00:15:10 +0100 +Subject: [PATCH] tests: run-lfs-symbols.sh needs gawk + +With awk=mawk, I get: +``` +FAIL: run-lfs-symbols.sh + +First sanity-check that LFS detection works. +checking ./testfile-nolfs +awk: line 3: syntax error at or near / +FAIL run-lfs-symbols.sh (exit status: 2) +``` + + * tests/run-lfs-symbols.sh: Call 'gawk' instead of 'awk'. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/tests/run-lfs-symbols.sh ++++ b/tests/run-lfs-symbols.sh +@@ -42,13 +42,13 @@ LFS_FORMAT='BEGIN { + LFS=$(printf "$LFS_FORMAT" "${abs_srcdir}/lfs-symbols") + + makeprint() { +- make print-$1 -C $2 |& awk -F= "/^$1=/{ print \$2 }" ++ make print-$1 -C $2 |& gawk -F= "/^$1=/{ print \$2 }" + } + + testrun_lfs() { + echo "checking $1" + if [ -e "$1" ]; then +- bad=$(testrun ${abs_top_builddir}/src/nm -u "$1" | awk "$LFS") ++ bad=$(testrun ${abs_top_builddir}/src/nm -u "$1" | gawk "$LFS") + if [ -n "$bad" ]; then + echo "$1 contains non-lfs symbols:" $bad + exit_status=1 +-- +2.41.0 + diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml index 1b2b95f274af..05def2bfd0b3 100644 --- a/dev-libs/elfutils/metadata.xml +++ b/dev-libs/elfutils/metadata.xml @@ -8,6 +8,7 @@ <use> <flag name="lzma">Support automatic decompression of LZMA-compressed files and kernel images</flag> <flag name="utils">Install command-line utilities (all the eu-* programs)</flag> + <flag name="debuginfod">Enable debuginfod support, both the debuginfod server and the libdebuginfod client library</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:elfutils_project:elfutils</remote-id> diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index 9d589fc7ddad..8a3aed938064 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -1,2 +1,6 @@ DIST ell-0.56.tar.xz 563096 BLAKE2B 3be874ddddab558911d5ea4e4fb0b32c1557b8577435f39ee88d7302bbb0efbd24671f6c426bbeaba2704ba45b865320e6f2e31f6a9c4d86e82dc8ed38ebae9f SHA512 7255470331927f67ebd1297e6c524c9c244234cf00923016c77d90bad5e4e381605c70373a7be4ecf9c1e72ec85fbc1671960dd31fb6eec279f2299e81c66ac1 DIST ell-0.57.tar.xz 563996 BLAKE2B 6fec30dc6994656b4a266cddaaf5984c3bcdb06b8b80d432b772f5c2a3166f2f3a4dca7ce1d44857901150a17f17be595606e535ef4ca0cb97476effbb6342cc SHA512 6dd6dea39b835550a4d4fd4ca1ec98c50842eb557d5f55d3a8f8d566f7b8ea3a4473135101860b4d8decfc4d24f55ff5e389ac95d1d309d5504b632cf80c975e +DIST ell-0.58.tar.xz 564908 BLAKE2B 8c3d2913db05186b22315f8b9eb62c6009d64d0c30dba4da4eacd92ca3c675a0c6e11aa23b76af710691ef1cabc14dafa157708aa7793939d36eee467a7e543d SHA512 28f0d215d05ae67a9d5aaa0de6c54d2b69d847a6a3127bebabe504c63083937b07d7dfb498f946bd6a40b22387946557dc886591ef87a7d5b926084083146950 +DIST ell-0.59.tar.xz 563416 BLAKE2B 81215058bdb75f387256b4cda843f2a523bae4ca10c472deedd19c77e97d6e3c8c399d4540da21f2ca72a7c532ae6d09c1350c6ea2189966a3375649466533d4 SHA512 adbb6c494209ee2a6fbd60f2baeea41f3b8bd99671cc03af1d18fbfdc29205537b42334d8cdda9c1d08972239e74f4ba8ec9e2c9a41dab4c414bce2f480cc5fc +DIST ell-0.60.tar.xz 565856 BLAKE2B a77ab4a26af154734f5258ad4a16ae97645f4cafc5b949c727ffe18e650ee2711d5b5028d1f9414314095f2e01faac9f3823ac83903ce611352a46c4192e2498 SHA512 a25c42f7432dd24bde3c534ee668a31d4a34e8e298c9e690d7aef9d98089e96987563a26d2bbee5b876aea69e4ecda0ede15a94dc30e211f1f341cbb6f26402f +DIST ell-0.61.tar.xz 565920 BLAKE2B 994a5b8b7eaffcf2274e1d020f54ce3f829a50de352a79744de156b59cb9f5b8db39adc53ab6f5728abd501a13815e58eac1c3359024bb22cd28e248a4b8f289 SHA512 0e57125a924ab4772c3c7ccf97040e416810bccd05ce8f0cb4525a4483f32eabc0f431fac3fff7afdc8bb0e145611b944e1f7fa8d10e6337fc7f97f190d9b0f8 diff --git a/dev-libs/ell/ell-0.56.ebuild b/dev-libs/ell/ell-0.56.ebuild index c8a82a95915c..c5dee49bcb13 100644 --- a/dev-libs/ell/ell-0.56.ebuild +++ b/dev-libs/ell/ell-0.56.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit flag-o-matic linux-info DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" if [[ "${PV}" == *9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" @@ -14,7 +14,7 @@ else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" IUSE="pie test" diff --git a/dev-libs/ell/ell-0.57.ebuild b/dev-libs/ell/ell-0.57.ebuild index 5e79649bd337..367a5a212600 100644 --- a/dev-libs/ell/ell-0.57.ebuild +++ b/dev-libs/ell/ell-0.57.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit flag-o-matic linux-info DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" if [[ "${PV}" == *9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" @@ -14,7 +14,7 @@ else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" IUSE="pie test" diff --git a/dev-libs/ell/ell-0.58.ebuild b/dev-libs/ell/ell-0.58.ebuild new file mode 100644 index 000000000000..5d0558d85d5b --- /dev/null +++ b/dev-libs/ell/ell-0.58.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic linux-info + +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" +else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86" +fi +LICENSE="LGPL-2.1+" +SLOT="0" + +IUSE="pie test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( sys-apps/dbus )" + +CONFIG_CHECK=" + ~TIMERFD + ~EVENTFD + ~CRYPTO_USER_API + ~CRYPTO_USER_API_HASH + ~CRYPTO_MD5 + ~CRYPTO_SHA1 + ~KEY_DH_OPERATIONS +" + +src_prepare() { + default + sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ + unit/test-dbus*.c unit/dbus.conf || die + [[ "${PV}" == *9999 ]] && eautoreconf +} + +src_configure() { + append-cflags "-fsigned-char" #662694 + local myeconfargs=( + $(use_enable pie) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die +} diff --git a/dev-libs/ell/ell-0.59.ebuild b/dev-libs/ell/ell-0.59.ebuild new file mode 100644 index 000000000000..367a5a212600 --- /dev/null +++ b/dev-libs/ell/ell-0.59.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic linux-info + +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" +else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +LICENSE="LGPL-2.1+" +SLOT="0" + +IUSE="pie test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( sys-apps/dbus )" + +CONFIG_CHECK=" + ~TIMERFD + ~EVENTFD + ~CRYPTO_USER_API + ~CRYPTO_USER_API_HASH + ~CRYPTO_MD5 + ~CRYPTO_SHA1 + ~KEY_DH_OPERATIONS +" + +src_prepare() { + default + sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ + unit/test-dbus*.c unit/dbus.conf || die + [[ "${PV}" == *9999 ]] && eautoreconf +} + +src_configure() { + append-cflags "-fsigned-char" #662694 + local myeconfargs=( + $(use_enable pie) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die +} diff --git a/dev-libs/ell/ell-0.60.ebuild b/dev-libs/ell/ell-0.60.ebuild new file mode 100644 index 000000000000..367a5a212600 --- /dev/null +++ b/dev-libs/ell/ell-0.60.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic linux-info + +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" +else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +LICENSE="LGPL-2.1+" +SLOT="0" + +IUSE="pie test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( sys-apps/dbus )" + +CONFIG_CHECK=" + ~TIMERFD + ~EVENTFD + ~CRYPTO_USER_API + ~CRYPTO_USER_API_HASH + ~CRYPTO_MD5 + ~CRYPTO_SHA1 + ~KEY_DH_OPERATIONS +" + +src_prepare() { + default + sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ + unit/test-dbus*.c unit/dbus.conf || die + [[ "${PV}" == *9999 ]] && eautoreconf +} + +src_configure() { + append-cflags "-fsigned-char" #662694 + local myeconfargs=( + $(use_enable pie) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die +} diff --git a/dev-libs/ell/ell-0.61.ebuild b/dev-libs/ell/ell-0.61.ebuild new file mode 100644 index 000000000000..367a5a212600 --- /dev/null +++ b/dev-libs/ell/ell-0.61.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic linux-info + +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" +else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +LICENSE="LGPL-2.1+" +SLOT="0" + +IUSE="pie test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( sys-apps/dbus )" + +CONFIG_CHECK=" + ~TIMERFD + ~EVENTFD + ~CRYPTO_USER_API + ~CRYPTO_USER_API_HASH + ~CRYPTO_MD5 + ~CRYPTO_SHA1 + ~KEY_DH_OPERATIONS +" + +src_prepare() { + default + sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ + unit/test-dbus*.c unit/dbus.conf || die + [[ "${PV}" == *9999 ]] && eautoreconf +} + +src_configure() { + append-cflags "-fsigned-char" #662694 + local myeconfargs=( + $(use_enable pie) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die +} diff --git a/dev-libs/ell/ell-9999.ebuild b/dev-libs/ell/ell-9999.ebuild index 5f049ed30b76..367a5a212600 100644 --- a/dev-libs/ell/ell-9999.ebuild +++ b/dev-libs/ell/ell-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit flag-o-matic linux-info DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" if [[ "${PV}" == *9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" @@ -14,7 +14,7 @@ else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" IUSE="pie test" diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild new file mode 100644 index 000000000000..8dc40fd0ca57 --- /dev/null +++ b/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic autotools + +DESCRIPTION="Loki C++ library from Modern C++ Design" +HOMEPAGE="https://data-room-software.org/libferris/" +SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=">=dev-libs/libsigc++-2.6:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.13-r3-configure-libsigc.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++11 + + econf +} + +src_install() { + default + + # package provides .pc files + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/ferrisloki/files/ferrisloki-3.0.13-r3-configure-libsigc.patch b/dev-libs/ferrisloki/files/ferrisloki-3.0.13-r3-configure-libsigc.patch new file mode 100644 index 000000000000..7c543a91d405 --- /dev/null +++ b/dev-libs/ferrisloki/files/ferrisloki-3.0.13-r3-configure-libsigc.patch @@ -0,0 +1,97 @@ +Rollup of src_prepare() from previous revisions plus additional fixes + + * derice damn configure script + * fix building with libsgc++-2.6 + * fix building with /bin/sh -> dash (bug #886619) +--- a/configure.in ++++ b/configure.in +@@ -1,4 +1,5 @@ + AC_INIT(ferrisloki, 3.0.13) ++AC_CONFIG_MACRO_DIR([macros]) + + PACKAGE=$PACKAGE_NAME + VERSION=$PACKAGE_VERSION +@@ -45,9 +46,6 @@ AC_STDC_HEADERS + #AC_ARG_PROGRAM + AM_PROG_LIBTOOL + +-STLPORT_CFLAGS="" +-STLPORT_LDFLAGS="" +- + ############################################################################### + ############################################################################### + ############################################################################### +@@ -57,12 +55,6 @@ AM_FERRIS_SIGC2( 2.0.0 ) + + ############################################################################### + +-CFLAGS=" $STLPORT_CFLAGS $CXXFLAGS -DNDEBUG " +-CXXFLAGS=" $STLPORT_CFLAGS $CXXFLAGS -DNDEBUG " +-LDFLAGS=" $STLPORT_LDFLAGS $LDFLAGS" +-AC_SUBST(CFLAGS) +-AC_SUBST(CPPFLAGS) +-AC_SUBST(LDFLAGS) + AC_SUBST(CXXFLAGS) + AC_SUBST(CXXCPPFLAGS) + +--- a/macros/ferrismacros.m4 ++++ b/macros/ferrismacros.m4 +@@ -303,30 +303,6 @@ if test x"$have_stlport" = xno; then + + AC_LANG_CPLUSPLUS + STLPORT_IO64_CFLAGS=" -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 " +- +- AC_CHECK_PROG( have_stlportcfg, stlport-config, yes, no ) +- +- if test "$have_stlportcfg" = yes; then +- +-# AC_PATH_GENERIC( STLPORT, 4.5, [ have_stlport=yes ], [foo=2] ) +- stlport_installed_version=`stlport-config --version` +- +- # Calculate the available version number +- [f_tmp=( `echo $stlport_installed_version | sed 's/[^0-9]\+/ /g'` )] +- [f_tmp=$(( 1000000 * ${f_tmp[0]:-0} + 1000 * ${f_tmp[1]:-0} + ${f_tmp[2]:-0} ))] +- +- [freq_version=( `echo $stlport_required_version | sed 's/[^0-9]\+/ /g'` )] +- [freq_version=$(( 1000000 * ${freq_version[0]:-0} + 1000 * ${freq_version[1]:-0} + ${freq_version[2]:-0} ))] +- +- if test $freq_version -gt $f_tmp ; then +- AC_MSG_WARN([STLPort version $1 is required, you have $stlport_installed_version]) +- else +- have_stlport=yes +- STLPORT_LIBS=" `stlport-config --libs` -lpthread " +- STLPORT_CFLAGS=" `stlport-config --cflags` " +- AM_FERRIS_STLPORT_INTERNAL_TRYLINK( [have_stlport=yes], [have_stlport=no] ) +- fi +- fi + fi + + if test x"$have_stlport" = xno; then +@@ -442,15 +418,11 @@ dnl + stlport_required_version=$1 + have_stlport=no + +-attempt_to_use_stlport=yes ++attempt_to_use_stlport=no + AC_ARG_ENABLE(stlport, + [--disable-stlport Don't use STLport even if it is detected], + [ +- if test x$enableval = xyes; then +- attempt_to_use_stlport=yes +- else +- attempt_to_use_stlport=no +- fi ++ attempt_to_use_stlport=no + ]) + + echo "attempt_to_use_stlport:${attempt_to_use_stlport}" +--- a/src/Extensions.hh ++++ b/src/Extensions.hh +@@ -29,7 +29,6 @@ + ******************************************************************************/ + + #include <sigc++/signal.h> +-#include <sigc++/object.h> + #include <loki/SmartPtr.h> + #include <loki/SmallObj.h> + diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest index 939cb14a6d29..ff76ed194531 100644 --- a/dev-libs/flatbuffers/Manifest +++ b/dev-libs/flatbuffers/Manifest @@ -1,2 +1 @@ -DIST flatbuffers-23.3.3.gh.tar.gz 2197401 BLAKE2B be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66 SHA512 4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0 DIST flatbuffers-23.5.26.gh.tar.gz 2257271 BLAKE2B 147425e7c018072f4ae4cdb3e034a4f434362d88d5e27b09375965993c279acfbed36064014c8f4fbe3fb81175ac0aa9b07629675e2c7ad33d59a9c85f2c3bb8 SHA512 cd0a5efad8016e1217d01a181d6b02e546f5693c6412361bfeaee820d5dfe5e2a424cee1963270e851c1a4f936ae8a0032a51c5bb16ee19313e0ecc77dc4ba31 diff --git a/dev-libs/flatbuffers/flatbuffers-23.3.3.ebuild b/dev-libs/flatbuffers/flatbuffers-23.3.3.ebuild deleted file mode 100644 index 5634974fa530..000000000000 --- a/dev-libs/flatbuffers/flatbuffers-23.3.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Memory efficient serialization library" -HOMEPAGE=" - https://flatbuffers.dev/ - https://github.com/google/flatbuffers/ -" -SRC_URI=" - https://github.com/google/flatbuffers/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -DOCS=( readme.md ) - -src_configure() { - local mycmakeargs=( - -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs) - -DFLATBUFFERS_BUILD_SHAREDLIB=ON - -DFLATBUFFERS_BUILD_TESTS=$(usex test) - -DFLATBUFFERS_BUILD_BENCHMARKS=OFF - ) - - cmake_src_configure -} diff --git a/dev-libs/flatbuffers/flatbuffers-23.5.26.ebuild b/dev-libs/flatbuffers/flatbuffers-23.5.26.ebuild index c8139e30f141..69e61ba51022 100644 --- a/dev-libs/flatbuffers/flatbuffers-23.5.26.ebuild +++ b/dev-libs/flatbuffers/flatbuffers-23.5.26.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/folks/folks-0.15.6.ebuild b/dev-libs/folks/folks-0.15.6.ebuild index 36c177483257..45afd5a484b8 100644 --- a/dev-libs/folks/folks-0.15.6.ebuild +++ b/dev-libs/folks/folks-0.15.6.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/f LICENSE="LGPL-2.1+" SLOT="0/26" # subslot = libfolks soname version -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux" IUSE="bluetooth eds telepathy test utils" REQUIRED_USE="bluetooth? ( eds )" diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest index 04aa3f3c0435..0c2bd2c704d2 100644 --- a/dev-libs/fribidi/Manifest +++ b/dev-libs/fribidi/Manifest @@ -1,2 +1 @@ -DIST fribidi-1.0.12.tar.xz 1154912 BLAKE2B f76f9d28f738f0cc9790ccdf0fe419cb0e7d70b24aa825844d23c4b31ad51c33f09c88ad4876fa6a52523f2a52d5eb7a4b50deeb70f9db750c69ac236ecfa8f5 SHA512 cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49 DIST fribidi-1.0.13.tar.xz 1170100 BLAKE2B 8cc31220304ddbdeb0047b30ed9084921920b32ad3f1bdcf29ecbb2fafbd430c391bc99bb7f205546ff8482aea1ef7ed369da71deb3474aa623fc2aeace1b62a SHA512 09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07 diff --git a/dev-libs/fribidi/fribidi-1.0.12.ebuild b/dev-libs/fribidi/fribidi-1.0.12.ebuild deleted file mode 100644 index 21e1a4e95aa4..000000000000 --- a/dev-libs/fribidi/fribidi-1.0.12.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson-multilib - -DESCRIPTION="A free implementation of the unicode bidirectional algorithm" -HOMEPAGE="https://fribidi.org/" -SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -multilib_src_configure() { - local emesonargs=( - -Ddeprecated=true - $(meson_native_use_bool doc docs) - -Dbin=true - $(meson_use test tests) - ) - meson_src_configure -} diff --git a/dev-libs/fribidi/fribidi-1.0.13.ebuild b/dev-libs/fribidi/fribidi-1.0.13.ebuild index cefc220b3796..d752a04351c7 100644 --- a/dev-libs/fribidi/fribidi-1.0.13.ebuild +++ b/dev-libs/fribidi/fribidi-1.0.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild index 50550ea6c716..ed99fb6e058e 100644 --- a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild +++ b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -15,9 +15,6 @@ SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" - src_prepare() { sed -i -e 's/ -O3 $(SIMD_FLAGS)//g' src/Makefile.am tools/Makefile.am test/Makefile.am examples/Makefile.am|| die eapply_user diff --git a/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild b/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild index 17847f27665f..1054fa5e2557 100644 --- a/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild +++ b/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild @@ -10,9 +10,10 @@ HOMEPAGE="https://gitlab.inria.fr/thome/gf2x/ https://gforge.inria.fr/projects/g # The Gitlab release is missing the autotools files. SRC_URI="https://gforge.inria.fr/frs/download.php/38243/${P}.tar.gz" -LICENSE="GPL-2" +# License is tricky, see their README +LICENSE="GPL-3+ GPL-2+" SLOT="0/3" # soname major version, defined in configure.ac -KEYWORDS="amd64 ~arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="fft static-libs custom-tune" IUSE_CPU_FLAGS=" pclmul sse2 sse3 sse4_1 ssse3" IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" diff --git a/dev-libs/girara/girara-0.4.0-r1.ebuild b/dev-libs/girara/girara-0.4.0-r1.ebuild new file mode 100644 index 000000000000..6ef1dcc66b0d --- /dev/null +++ b/dev-libs/girara/girara-0.4.0-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson virtualx + +DESCRIPTION="UI library that focuses on simplicity and minimalism" +HOMEPAGE="https://pwmt.org/projects/girara/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi + +LICENSE="ZLIB" +SLOT="0" +IUSE="doc libnotify test" +RESTRICT="!test? ( test )" + +DEPEND=" + app-accessibility/at-spi2-core + dev-libs/glib:2 + dev-libs/json-glib:= + media-libs/harfbuzz:= + x11-libs/cairo[glib] + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-3.20:3 + x11-libs/pango + libnotify? ( x11-libs/libnotify ) +" +RDEPEND="${DEPEND}" +# Tests are run under virtx +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( + dev-libs/check + x11-libs/gtk+:3[X] + ) +" + +src_configure() { + local -a emesonargs=( + -Djson=enabled + $(meson_feature doc docs) + $(meson_feature libnotify notify) + ) + meson_src_configure +} + +src_test() { + # TODO: run test on wayland + virtx meson_src_test +} diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild index 88dc773e88de..a00a2c6f2222 100644 --- a/dev-libs/girara/girara-9999.ebuild +++ b/dev-libs/girara/girara-9999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson virtualx DESCRIPTION="UI library that focuses on simplicity and minimalism" HOMEPAGE="https://pwmt.org/projects/girara/" -if [[ ${PV} == *999 ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" EGIT_BRANCH="develop" @@ -23,24 +23,38 @@ IUSE="doc libnotify test" RESTRICT="!test? ( test )" -DEPEND="dev-libs/glib:2 +DEPEND=" + app-accessibility/at-spi2-core + dev-libs/glib:2 dev-libs/json-glib:= + media-libs/harfbuzz:= + x11-libs/cairo[glib] + x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.20:3 - libnotify? ( x11-libs/libnotify )" + x11-libs/pango + libnotify? ( x11-libs/libnotify ) +" RDEPEND="${DEPEND}" -BDEPEND="doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) - virtual/pkgconfig" +# Tests are run under virtx +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( + dev-libs/check + x11-libs/gtk+:3[X] + ) +" src_configure() { - local emesonargs=( + local -a emesonargs=( -Djson=enabled - -Ddocs=$(usex doc enabled disabled) - -Dnotify=$(usex libnotify enabled disabled) + $(meson_feature doc docs) + $(meson_feature libnotify notify) ) meson_src_configure } src_test() { + # TODO: run test on wayland virtx meson_src_test } diff --git a/dev-libs/girara/metadata.xml b/dev-libs/girara/metadata.xml index 4311c033d558..daab629eec23 100644 --- a/dev-libs/girara/metadata.xml +++ b/dev-libs/girara/metadata.xml @@ -1,21 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> + <maintainer type="person" proxied="yes"> + <email>leohdz172@proton.me</email> + <name>Leonardo Hernández Hernández</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <maintainer status="active"> - <email>mlq@pwmt.org</email> - <name>Moritz Lipp</name> - </maintainer> - <maintainer status="active"> - <email>sebastian+dev@ramacher.at</email> - <name>Sebastian Ramacher</name> + <email>mlq@pwmt.org</email> + <name>Moritz Lipp</name> </maintainer> - <changelog>http://pwmt.org/projects/girara/download/</changelog> - <doc lang="en">http://pwmt.org/projects/girara/</doc> - <bugs-to>http://bugs.pwmt.org/</bugs-to> + <maintainer status="active"> + <email>sebastian+dev@ramacher.at</email> + <name>Sebastian Ramacher</name> + </maintainer> + <changelog>http://pwmt.org/projects/girara/download/</changelog> + <doc lang="en">http://pwmt.org/projects/girara/</doc> + <bugs-to>http://bugs.pwmt.org/</bugs-to> </upstream> </pkgmetadata> diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index f6dbe776d33d..56f37acbbaf4 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1 +1,2 @@ -DIST gjs-1.76.0.tar.xz 645364 BLAKE2B 9987033883e466c983af007c870cba4f2ef70ee08e276777e1b52103ddcebd1285ca9f3ce64c8ef52437a829157f58902cfb921eed06442e53fd9778d9cd9f2b SHA512 fa44431f431f14b82c648c388046b83722808db52d2bbe2deeb8d270d6fbeee9c4ee27feaa4fef425e1ab5ac65a1e68d7aa9457d543044362752810128064ea6 +DIST gjs-1.76.2.tar.xz 646232 BLAKE2B 66466eeb5f956d5041f4e63ba977dc9a688455770c39bcedd63576f56fde9821ed3c827c470f7e3befbbf7828fbd197706637da458876ec129d6c16323e414e8 SHA512 26b024874ce69a6f58b5fabe006b8d5417971db9de00e21ecd352715b4535f405d162bb81c0cf6b20313f0f78833962080ac1cb9bd42cfff9cf6a74340458540 +DIST gjs-1.78.0.tar.xz 653500 BLAKE2B f2b6c3d80f55c1b3365fdc94dcedec357fc21ec7f92eccdf24cc028eb006538057d0d6e3328bc2f743a563ba496da5daa8585fabd6fbf52acd38c990b8a4e8ba SHA512 28ad3ff5c031b8e78622244918994ca5f510e4b403a382e7d0b0bcb9a0611be61e103398773328be4c405b49d7984c089180a5fb603518b412d01a935fb3ceb3 diff --git a/dev-libs/gjs/gjs-1.76.0.ebuild b/dev-libs/gjs/gjs-1.76.2.ebuild index 510b1bfe27b3..ef4d2148a240 100644 --- a/dev-libs/gjs/gjs-1.76.0.ebuild +++ b/dev-libs/gjs/gjs-1.76.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" IUSE="+cairo examples readline sysprof test" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" RESTRICT="!test? ( test )" RDEPEND=" @@ -34,7 +34,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-move_have_gtk4_to_the_appropriate_place.patch" + "${FILESDIR}/${PN}-1.76.0-move_have_gtk4_to_the_appropriate_place.patch" ) src_configure() { diff --git a/dev-libs/gjs/gjs-1.78.0.ebuild b/dev-libs/gjs/gjs-1.78.0.ebuild new file mode 100644 index 000000000000..3f77c1d06628 --- /dev/null +++ b/dev-libs/gjs/gjs-1.78.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome.org meson virtualx + +DESCRIPTION="Javascript bindings for GNOME" +HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" + +LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" +SLOT="0" +IUSE="+cairo examples readline sysprof test" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.66.0:2 + dev-libs/libffi:= + >=dev-libs/gobject-introspection-1.71.1:= + dev-lang/spidermonkey:115 + cairo? ( x11-libs/cairo[X,glib] ) + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) + test? ( + sys-apps/dbus + >=x11-libs/gtk+-3.20:3[introspection] + ) +" +BDEPEND=" + virtual/pkgconfig +" + +src_configure() { + append-cppflags -DG_DISABLE_CAST_CHECKS + + # On musl, it's required that either gjs, pixman or gnome-shell to be built + # with a larger stack otherwise librsvg fails to render a particular SVG, as + # a result we fail to get gdm or gnome-shell running (greeted with a fail + # whale screen). The bug has been reported to librsvg. This is ideally just + # a temporary workaround until we understand what exactly needs a larger + # stack size, as it's not sufficient to do just librsvg. + # + # Please refer to: + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686 + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874 + # + # TODO: Find an actual fix instead of increasing the stack + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + # FIXME: add systemtap/dtrace support, like in glib:2 + local emesonargs=( + $(meson_feature cairo) + $(meson_feature readline) + $(meson_feature sysprof profiler) + -Dinstalled_tests=false + $(meson_use !test skip_dbus_tests) + $(meson_use !test skip_gtk_tests) + -Db_pch=True # TODO this has to go + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 8ad462b9a26f..f64e2b2aae89 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,2 +1,3 @@ -DIST glib-2.76.2.tar.xz 5273836 BLAKE2B db5d5e45fe4a17bade7f5bf923ac0e5541237d19146ede33b4d52f05b82e4ecb94519393f49ac3b04e17d0f56bfd5dd99b8e81ae80956cfdb5cb2396cd5ec8cc SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6 -DIST glib-2.76.3.tar.xz 5273460 BLAKE2B 894635281d1a3eb60d274b8db91cd59069b6d0abe61295175c794ad44e8669d869009fac44c7d6f416a93adcea5b9aeb90b944047d013fa1f2d9b1a8ded3de1e SHA512 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e +DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7 +DIST glib-2.78.0.tar.xz 5327096 BLAKE2B 3a494a16d12b17c7986bbe865d5e3b2727d40e7272fbb34897a90173c0fb780b0e7f024042f60ac6d1fcb9a2a4731948b6ac733c2bd6bd27c32b97281e20fc72 SHA512 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765 +DIST glib-2.78.1.tar.xz 5320740 BLAKE2B af8f2e83600dfb3ec84702399cb00a3aaedbc80087e35dc7cc2e2374d4fe5fdf82707ac8c911da1c53eb7b027c9da9ecfc1c0a8f56b39431fa4cf44cad5b10f7 SHA512 aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376 diff --git a/dev-libs/glib/glib-2.76.2.ebuild b/dev-libs/glib/glib-2.76.4.ebuild index 2741ab50f0df..b5bb50fb4a38 100644 --- a/dev-libs/glib/glib-2.76.2.ebuild +++ b/dev-libs/glib/glib-2.76.4.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg @@ -99,7 +99,8 @@ src_prepare() { #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then # ewarn "Some tests will be skipped due to missing terminal program" # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die # desktop-app-info/launch* might fail similarly sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die @@ -165,10 +166,12 @@ src_prepare() { } multilib_src_configure() { - # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) #if tc-is-cross-compiler ; then # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property #case ${CHOST} in #hppa*|metag*) export glib_cv_stack_grows=yes ;; #*) export glib_cv_stack_grows=no ;; @@ -224,7 +227,9 @@ multilib_src_install() { multilib_src_install_all() { # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson rm "${ED}/usr/bin/glib-genmarshal" || die rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die rm "${ED}/usr/bin/glib-mkenums" || die diff --git a/dev-libs/glib/glib-2.76.3.ebuild b/dev-libs/glib/glib-2.78.0.ebuild index 0d286c90c737..642ad1b40159 100644 --- a/dev-libs/glib/glib-2.76.3.ebuild +++ b/dev-libs/glib/glib-2.78.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg diff --git a/dev-libs/glib/glib-2.78.1.ebuild b/dev-libs/glib/glib-2.78.1.ebuild new file mode 100644 index 000000000000..642ad1b40159 --- /dev/null +++ b/dev-libs/glib/glib-2.78.1.ebuild @@ -0,0 +1,312 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..11} ) + +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !<dev-util/gdbus-codegen-${PV} + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + --buildtype $(usex debug debug plain) + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest index f42a40a68144..c5c32b61bb00 100644 --- a/dev-libs/gmime/Manifest +++ b/dev-libs/gmime/Manifest @@ -1,2 +1,3 @@ DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14 DIST gmime-3.2.13.tar.xz 2231624 BLAKE2B c1b4af7ea911c6e2cdea01700d76d218028f7a7f3fc0443b15f915658f945b0fd784928eaa572b0a4b1cd2ea6f7b2812de75f066e3dd2bef23ebd4075a393ee9 SHA512 cfbf5d9e8d6cafcb340b6e470acaf7ae0a96581d39119a751b22fcf3ede089cc24accbd26a79ec2a4b7901ce66d7092765e8c388bbfa2138606dbb4b3f81f4d3 +DIST gmime-3.2.14.tar.xz 2231340 BLAKE2B bbe147151349c626d92890783a3fccd4b1156b5a9fc305812447f28ec34d5d7694a702f99865ad5ef41737eb4e0d0c08d879e4525f58c272972531c51d436fd6 SHA512 d6127a8567f96784b3f975452cd43a4ef6c8921845feb11974f785576f7ef138f25d20d0f309022893ca445fffb000b4dc98bf65ff3a781ececd5c16b1f0e9c6 diff --git a/dev-libs/gmime/gmime-3.2.14.ebuild b/dev-libs/gmime/gmime-3.2.14.ebuild new file mode 100644 index 000000000000..d1e213df5247 --- /dev/null +++ b/dev-libs/gmime/gmime-3.2.14.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome2 vala + +DESCRIPTION="Library for creating and parsing MIME messages" +HOMEPAGE="https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/" +SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz" + +SLOT="3.0" +LICENSE="LGPL-2.1+" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="crypt doc idn test +vala" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.68.0:2 + sys-libs/zlib + crypt? ( >=app-crypt/gpgme-1.8.0:= ) + idn? ( net-dns/libidn2:= ) + vala? ( + $(vala_depend) + >=dev-libs/gobject-introspection-1.30.0:= + ) +" +DEPEND="${RDEPEND} + virtual/libiconv +" +BDEPEND=" + >=dev-util/gtk-doc-am-1.8 + virtual/pkgconfig + doc? ( app-text/docbook-sgml-utils ) +" + +src_prepare() { + gnome2_src_prepare + use vala && vala_setup +} + +src_configure() { + if [[ ${CHOST} == *-solaris* ]]; then + # bug #???, why not use --with-libiconv + append-libs iconv + fi + + gnome2_src_configure \ + --enable-largefile \ + $(use_enable crypt crypto) \ + $(use_enable vala) \ + $(use_with idn libidn) \ + $(usex doc "" DB2HTML=) +} + +src_compile() { + gnome2_src_compile + if use doc; then + emake -C docs/tutorial html + fi +} + +src_install() { + gnome2_src_install + + if use doc ; then + docinto tutorial + dodoc -r docs/tutorial/html/ + fi +} diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest index 846b78dc7601..bb161b9f1dee 100644 --- a/dev-libs/gmp/Manifest +++ b/dev-libs/gmp/Manifest @@ -1,3 +1,4 @@ DIST gmp-6.2.1-arm64-darwin.patch.bz2 2520 BLAKE2B 3d4e9dbd29dc9aa81f0c9e0de4a5904c989d54148c9e3dcc5097a43b3fb1ecd17802dacfc71ee131c0805a345f5dce9009e88439758d3a0ed8b3a88526353b4a SHA512 72d49f09c3facd75036c945e076207e72e5673ba9605999c32a122e43e8b970ed646c8ca8f07acbb62bff5e7c387d4c8e1f73ca73e50ac3f574b5f6471d66d56 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 +DIST gmp-6.3.0.tar.xz 2094196 BLAKE2B a865129e2b3f634ec5bad7f97ed89532e43f5662ac47a7d8ab7f0df8c9f8d0886bd984651422e2573c2163bca69c0547c248147ec90880accbd53db97dc0ddee SHA512 e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2 DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb diff --git a/dev-libs/gmp/gmp-6.2.1-r2.ebuild b/dev-libs/gmp/gmp-6.2.1-r2.ebuild deleted file mode 100644 index 7f25f4bab2a8..000000000000 --- a/dev-libs/gmp/gmp-6.2.1-r2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool flag-o-matic multilib-minimal toolchain-funcs - -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MANUAL_PV=${MY_PV} -MANUAL_PV=6.2.1 -MY_P=${PN}-${MY_PV} -PLEVEL=${PV/*p} -DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" -HOMEPAGE="https://gmplib.org/" -SRC_URI=" - https://gmplib.org/download/gmp/${MY_P}.tar.xz - mirror://gnu/${PN}/${MY_P}.tar.xz - doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf ) -" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-darwin.patch.bz2" - -LICENSE="|| ( LGPL-3+ GPL-2+ )" -# The subslot reflects the C & C++ SONAMEs. -SLOT="0/10.4" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+asm doc +cxx pic static-libs" - -BDEPEND="sys-devel/m4 - app-arch/xz-utils" - -S=${WORKDIR}/${MY_P%a} - -DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache ) -HTML_DOCS=( doc ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch - "${FILESDIR}"/${PN}-6.2.1-no-zarch.patch - "${WORKDIR}"/${P}-arm64-darwin.patch - "${FILESDIR}"/${P}-CVE-2021-43618.patch -) - -src_prepare() { - default - - # We cannot run autotools here as gcc depends on this package - elibtoolize - - # bug #536894 - if [[ ${CHOST} == *-darwin* ]] ; then - eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch - fi - - # GMP uses the "ABI" env var during configure as does Gentoo (econf). - # So, to avoid patching the source constantly, wrap things up. - mv configure configure.wrapped || die - cat <<-\EOF > configure - #!/usr/bin/env sh - exec env ABI="${GMPABI}" "$0.wrapped" "$@" - EOF - - # Patches to original configure might have lost the +x bit. - chmod a+rx configure{,.wrapped} || die -} - -multilib_src_configure() { - # Generally a very fragile package - strip-flags - # Miscompiled with LTO at least on arm64, bug #889948 - filter-lto - - # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works - # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) - if [[ ${CHOST} == hppa2.0-* ]] ; then - GMPABI="1.0" - fi - - # ABI mappings (needs all architectures supported) - case ${ABI} in - 32|x86) GMPABI=32;; - 64|amd64|n64) GMPABI=64;; - [onx]32) GMPABI=${ABI};; - esac - export GMPABI - - tc-export CC - - # --with-pic forces static libraries to be built as PIC - # and without TEXTRELs. musl does not support TEXTRELs: bug #707332 - ECONF_SOURCE="${S}" econf \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" \ - --localstatedir="${EPREFIX}"/var/state/gmp \ - --enable-shared \ - $(use_enable asm assembly) \ - $(use_enable cxx) \ - $(use pic && echo --with-pic) \ - $(use_enable static-libs static) -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # Should be a standalone lib - rm -f "${ED}"/usr/$(get_libdir)/libgmp.la - - # This requires libgmp - local la="${ED}/usr/$(get_libdir)/libgmpxx.la" - if ! use static-libs ; then - rm -f "${la}" - fi -} - -multilib_src_install_all() { - einstalldocs - use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/ -} diff --git a/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/dev-libs/gmp/gmp-6.2.1-r5.ebuild index 288f625d457f..dc9a1c129771 100644 --- a/dev-libs/gmp/gmp-6.2.1-r5.ebuild +++ b/dev-libs/gmp/gmp-6.2.1-r5.ebuild @@ -8,7 +8,6 @@ inherit gnuconfig libtool flag-o-matic multilib-minimal toolchain-funcs MY_PV=${PV/_p*} MY_PV=${MY_PV/_/-} -MANUAL_PV=${MY_PV} MANUAL_PV=6.2.1 MY_P=${PN}-${MY_PV} diff --git a/dev-libs/gmp/gmp-6.3.0.ebuild b/dev-libs/gmp/gmp-6.3.0.ebuild new file mode 100644 index 000000000000..2cb6293940af --- /dev/null +++ b/dev-libs/gmp/gmp-6.3.0.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnuconfig libtool flag-o-matic multilib-minimal toolchain-funcs + +MY_PV=${PV/_p*} +MY_PV=${MY_PV/_/-} + +MANUAL_PV=6.2.1 + +MY_P=${PN}-${MY_PV} +PLEVEL=${PV/*p} + +DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" +HOMEPAGE="https://gmplib.org/" +SRC_URI=" + https://gmplib.org/download/gmp/${MY_P}.tar.xz + mirror://gnu/${PN}/${MY_P}.tar.xz + doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf ) +" +S="${WORKDIR}"/${MY_P%a} + +LICENSE="|| ( LGPL-3+ GPL-2+ )" +# The subslot reflects the C & C++ SONAMEs. +SLOT="0/10.4" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+asm doc +cpudetection +cxx pic static-libs" +REQUIRED_USE="cpudetection? ( asm )" +RESTRICT="!cpudetection? ( bindist )" + +BDEPEND=" + app-arch/xz-utils + sys-devel/m4 +" + +DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache ) +HTML_DOCS=( doc ) + +MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch + "${FILESDIR}"/${PN}-6.2.1-no-zarch.patch +) + +pkg_pretend() { + if use cpudetection && ! use amd64 && ! use x86 ; then + elog "Using generic C implementation on non-amd64/x86 with USE=cpudetection" + elog "--enable-fat is a no-op on alternative arches." + elog "To obtain an optimized build, set USE=-cpudetection, but binpkgs should not then be made." + fi +} + +src_prepare() { + default + + # We cannot run autotools here as gcc depends on this package + elibtoolize + + # bug #536894 + if [[ ${CHOST} == *-darwin* ]] ; then + eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch + fi + + # GMP uses the "ABI" env var during configure as does Gentoo (econf). + # So, to avoid patching the source constantly, wrap things up. + mv configure configure.wrapped || die + cat <<-\EOF > configure + #!/usr/bin/env sh + exec env ABI="${GMPABI}" "$0.wrapped" "$@" + EOF + + # Patches to original configure might have lost the +x bit. + chmod a+rx configure{,.wrapped} || die + + # Save the upstream files named config.{guess,sub} which are + # wrappers around the gnuconfig versions. + mkdir "${T}"/gmp-gnuconfig || die + mv config.guess "${T}"/gmp-gnuconfig/config.guess || die + mv config.sub "${T}"/gmp-gnuconfig/config.sub || die + # Grab fresh copies from gnuconfig. + touch config.guess config.sub || die + gnuconfig_update + # Rename the fresh copies to the filenames the wrappers from GMP + # expect. + mv config.guess configfsf.guess || die + mv config.sub configfsf.sub || die +} + +multilib_src_configure() { + # Generally a very fragile package + strip-flags + # Miscompiled with LTO at least on arm64, bug #889948 + # 6.3.0 says it now supports LTO, but needs retesting on a variety + # of platforms. Fix was maybe https://gmplib.org/repo/gmp-6.3/rev/9c324044f4b5. + filter-lto + + # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works + # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) + if [[ ${CHOST} == hppa2.0-* ]] ; then + GMPABI="1.0" + fi + + # ABI mappings (needs all architectures supported) + case ${ABI} in + 32|x86) GMPABI=32;; + 64|amd64|n64) GMPABI=64;; + [onx]32) GMPABI=${ABI};; + esac + export GMPABI + + tc-export CC + + # https://gmplib.org/manual/Notes-for-Package-Builds + local myeconfargs=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + + --localstatedir="${EPREFIX}"/var/state/gmp + --enable-shared + + $(use_enable asm assembly) + # fat is needed to avoid gmp installing either purely generic + # or specific-to-used-CPU (which our config.guess refresh prevents at the moment). + # Both Fedora and opensuse use this option to tackle the issue, bug #883201. + # + # This only works for amd64/x86, so to get accelerated performance + # (i.e. not using the generic C), one needs USE=-cpudetection if + # on non-amd64/x86. + # + # (We do not mask USE=cpudetection on !amd64/x86 because we want + # the flag to be useful on other arches to allow opting out of the + # config.guess logic below.) + $(use_enable cpudetection fat) + $(use_enable cxx) + $(use_enable static-libs static) + + # --with-pic forces static libraries to be built as PIC + # and without TEXTRELs. musl does not support TEXTRELs: bug #707332 + $(use pic && echo --with-pic) + + # XXX: In the past, we had PGO support with upstream's 'tuneup' script + # per https://gmplib.org/manual/Performance-optimization, but we had + # a variety of issues with it: bug #454912, bug #650558, and bug #658688. + ) + + # Move the wrappers from GMP back into place (may have been destroyed by previous econf run) + cp "${T}"/gmp-gnuconfig/config.guess "${S}"/config.guess || die + cp "${T}"/gmp-gnuconfig/config.sub "${S}"/config.sub || die + + # See bug #883201 again. + if ! use cpudetection && ! tc-is-cross-compiler ; then + local gmp_host=$("${S}"/config.guess || die "failed to run config.guess") + + if [[ -z ${gmp_host} ]] ; then + die "Empty result from GMP's custom config.guess!" + fi + + einfo "GMP guessed processor type: ${gmp_host}" + ewarn "This build will only work on this machine. Enable USE=cpudetection for binary packages!" + export ac_cv_build="${gmp_host}" + export ac_cv_host="${gmp_host}" + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + # Should be a standalone lib + rm -f "${ED}"/usr/$(get_libdir)/libgmp.la + + # This requires libgmp + local la="${ED}/usr/$(get_libdir)/libgmpxx.la" + if ! use static-libs ; then + rm -f "${la}" || die + fi +} + +multilib_src_install_all() { + einstalldocs + use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/ +} diff --git a/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild b/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild index 1533ed71e2a8..c94405ca93aa 100644 --- a/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild +++ b/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.t LICENSE="GPL-3+ LGPL-2.1+ FDL-1.3+" SLOT="0" -KEYWORDS="~x64-macos ~x64-solaris" +KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris" IUSE="doc" S="${WORKDIR}/${PN}-${GIT_TAG}" diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest index 2d9f357291f1..dcf0501a11b1 100644 --- a/dev-libs/gobject-introspection-common/Manifest +++ b/dev-libs/gobject-introspection-common/Manifest @@ -1 +1,2 @@ DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916 +DIST gobject-introspection-1.78.1.tar.xz 1060296 BLAKE2B 115cf9ea27cec2d8d3a84081c909b72144fd1568bc316677c26f49652dc93b34fba10701678ad4977dcf97a89f7608545fbd2d73c2503c87635b2102e66ae024 SHA512 a3081882995a762645b04faa71082dbd523bee845519007e48b13235aad8a4cd4c74f0d042a6c17710125f945bd970e4b76e95a559274e294d595e04725a4e97 diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild index c2a490838f5d..cf04ae5c7db0 100644 --- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.78.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.78.1.ebuild new file mode 100644 index 000000000000..8918bd9672fe --- /dev/null +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.78.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME_ORG_MODULE="gobject-introspection" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for GObject Introspection" +HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" +# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: +# https://forums.gentoo.org/viewtopic-p-7421930.html + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins m4/introspection.m4 + + insinto /usr/share/gobject-introspection-1.0 + doins Makefile.introspection +} diff --git a/dev-libs/gobject-introspection-common/metadata.xml b/dev-libs/gobject-introspection-common/metadata.xml index 819a2b39b6f5..77da9c6e7c5f 100644 --- a/dev-libs/gobject-introspection-common/metadata.xml +++ b/dev-libs/gobject-introspection-common/metadata.xml @@ -5,6 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="gnome-gitlab">GNOME/gobject-introspection</remote-id> </upstream> diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest index 2d9f357291f1..dcf0501a11b1 100644 --- a/dev-libs/gobject-introspection/Manifest +++ b/dev-libs/gobject-introspection/Manifest @@ -1 +1,2 @@ DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916 +DIST gobject-introspection-1.78.1.tar.xz 1060296 BLAKE2B 115cf9ea27cec2d8d3a84081c909b72144fd1568bc316677c26f49652dc93b34fba10701678ad4977dcf97a89f7608545fbd2d73c2503c87635b2102e66ae024 SHA512 a3081882995a762645b04faa71082dbd523bee845519007e48b13235aad8a4cd4c74f0d042a6c17710125f945bd970e4b76e95a559274e294d595e04725a4e97 diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild new file mode 100644 index 000000000000..56ef5420626c --- /dev/null +++ b/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" +inherit gnome.org meson python-single-r1 xdg + +DESCRIPTION="Introspection system for GObject-based libraries" +HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" + +LICENSE="LGPL-2+ GPL-2+" +SLOT="0" +IUSE="doctool gtk-doc test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +# virtual/pkgconfig needed at runtime, bug #505408 +RDEPEND=" + >=dev-libs/gobject-introspection-common-${PV} + >=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2 + dev-libs/libffi:= + doctool? ( + $(python_gen_cond_dep ' + dev-python/mako[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ') + ) + virtual/pkgconfig + ${PYTHON_DEPS} +" +# Wants real bison, not app-alternatives/yacc +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( + >=dev-util/gtk-doc-1.19 + app-text/docbook-xml-dtd:4.3 + app-text/docbook-xml-dtd:4.5 + ) + sys-devel/bison + sys-devel/flex + test? ( + x11-libs/cairo[glib] + $(python_gen_cond_dep ' + dev-python/mako[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ') + ) +" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature test cairo) + $(meson_feature doctool) + #-Dglib_src_dir + $(meson_use gtk-doc gtk_doc) + #-Dcairo_libname + -Dpython="${EPYTHON}" + #-Dgir_dir_prefix + ) + meson_src_configure +} + +src_install() { + meson_src_install + python_fix_shebang "${ED}"/usr/bin/ + python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner + + # Prevent collision with gobject-introspection-common + rm -v "${ED}"/usr/share/aclocal/introspection.m4 \ + "${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die + rmdir "${ED}"/usr/share/aclocal || die +} diff --git a/dev-libs/gom/gom-0.4.ebuild b/dev-libs/gom/gom-0.4.ebuild index 31378c0ecf74..586b7eb92c0f 100644 --- a/dev-libs/gom/gom-0.4.ebuild +++ b/dev-libs/gom/gom-0.4.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gom" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +introspection python test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest index a4718bfbb589..76ae036375c7 100644 --- a/dev-libs/gost-engine/Manifest +++ b/dev-libs/gost-engine/Manifest @@ -1,2 +1,4 @@ DIST gost-engine-3.0.1.tar.gz 1645245 BLAKE2B 713a7343f9c11feec361dd2828b00dd7d47518f5a1b047a6e11f8d8eea206ce9058ace1bd70e12b4cb2200789eb8209de671cb5e2692e95391b4e7a82d0badc2 SHA512 eb9fb126393cfe23bcef0f45c05b38d39aadd8909419ebcf6dab4800bd7372b63891e9061f8e70686f8ba5cd58669681895b36320ed6a8cc0ca1ff037aa73b85 +DIST gost-engine-3.0.2.tar.gz 1654695 BLAKE2B 76a14b6a33e7457dc879f45e5f8c1a0db633561269ba156ea1cad9d00dd082196382fb952706ced736ca7da6cfd698533b3f5483ad09f3b93748acd03c4a15ac SHA512 f8e7709df806e5d0a715e3f4f97644f7db4612a868201e730ab2ec62a3099f5c9136af6e4cc4ed5c69fe4ed25ce72b50d29fcf8c961cb3a9e9fa2e1fa8242c9b +DIST gost-engine-3.0.3.tar.gz 1654715 BLAKE2B e2adfeafb38a35eb72fea583ec2fffa48431fda4fbb4d940d9e495a3d94ad273ecdfa131a117626d8fcc300a62ef7e5173879dac027a962f45b1363ee59e1715 SHA512 3a66e95b743475f36372b51de852caa442ff423110668e7ba082f93f7c7d151a5d19db7f3ddbd4dae4af4578cdf0e50c099b71dcc6d7e8f049cbfb3fb28f567a DIST libprov-8a126e09547630ef900177625626b6156052f0ee.tar.gz 5693 BLAKE2B e2c9c1a6c31532ea830c94bca9a7e2f0c0d0688c628ba0851ff541a0d9fd9aa727c5ed9b78901032e928ea8cfb63483d3bfeadac40c61ddd990df00e2c7d3cd9 SHA512 4633ca9ad21585483dbaf28e416f0f3416c814bb41b0ccf036e438275d83393e70ed1c2cd0298fc87d8e928074a7afcf3971a0d790014cc0d200c92bb2defe4d diff --git a/dev-libs/gost-engine/gost-engine-3.0.2.ebuild b/dev-libs/gost-engine/gost-engine-3.0.2.ebuild new file mode 100644 index 000000000000..a66a0b40c861 --- /dev/null +++ b/dev-libs/gost-engine/gost-engine-3.0.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL" +HOMEPAGE="https://github.com/gost-engine/engine" +IUSE="test" +RESTRICT="!test? ( test )" +SLOT="0/${PV}" + +COMMON_DEPEND=">=dev-libs/openssl-3.0.0:0=" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + test? ( + dev-lang/perl + )" +RDEPEND="${COMMON_DEPEND}" + +LICENSE="openssl" + +DOCS=( INSTALL.md README.gost README.md ) + +LIBPROV_COMMIT="8a126e09547630ef900177625626b6156052f0ee" +if [[ ${PV} == "9999" ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/gost-engine/engine.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~hppa" + SRC_URI="https://github.com/gost-engine/engine/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/provider-corner/libprov/archive/${LIBPROV_COMMIT}.tar.gz -> libprov-${LIBPROV_COMMIT}.tar.gz" + S="${WORKDIR}/engine-${PV}" +fi + +src_prepare() { + cp -R "${WORKDIR}/libprov-${LIBPROV_COMMIT}/." "${S}/libprov" || die + cmake_src_prepare + sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die +} diff --git a/dev-libs/gost-engine/gost-engine-3.0.3.ebuild b/dev-libs/gost-engine/gost-engine-3.0.3.ebuild new file mode 100644 index 000000000000..a66a0b40c861 --- /dev/null +++ b/dev-libs/gost-engine/gost-engine-3.0.3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL" +HOMEPAGE="https://github.com/gost-engine/engine" +IUSE="test" +RESTRICT="!test? ( test )" +SLOT="0/${PV}" + +COMMON_DEPEND=">=dev-libs/openssl-3.0.0:0=" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + test? ( + dev-lang/perl + )" +RDEPEND="${COMMON_DEPEND}" + +LICENSE="openssl" + +DOCS=( INSTALL.md README.gost README.md ) + +LIBPROV_COMMIT="8a126e09547630ef900177625626b6156052f0ee" +if [[ ${PV} == "9999" ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/gost-engine/engine.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~hppa" + SRC_URI="https://github.com/gost-engine/engine/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/provider-corner/libprov/archive/${LIBPROV_COMMIT}.tar.gz -> libprov-${LIBPROV_COMMIT}.tar.gz" + S="${WORKDIR}/engine-${PV}" +fi + +src_prepare() { + cp -R "${WORKDIR}/libprov-${LIBPROV_COMMIT}/." "${S}/libprov" || die + cmake_src_prepare + sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die +} diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest index 92f34548dc06..5e603f726d52 100644 --- a/dev-libs/gumbo/Manifest +++ b/dev-libs/gumbo/Manifest @@ -1 +1,2 @@ DIST gumbo-0.10.1.tar.gz 2119285 BLAKE2B 21a8dd479bcc568842ce85782d4de903c1b79d842dd5381c01fd7b7ee802872484bf8b647edde9c2a4939404a4d042e920633f4d337870cd9f4197a90b158ffd SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1 +DIST gumbo-0.11.0.tar.gz 2119456 BLAKE2B 9da25c08e94af6f33b7e6e66017da9b7780a5f58aef7eac7d03bdf98c415e13252377dadd4f6fe3b8ddcf7d2aea8d4aff6edac181ea8cf8a4fa152f7c711e107 SHA512 7fdfee66db32dfda70bb1f2069b9bf59f2293fd30e1360d7adcced68e894a42e42e2e5de05204ea4ee30cb8d680fd48b66400a68710fe5f00fb3c84004c85928 diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild index dbc4061299ce..038fc1665b99 100644 --- a/dev-libs/gumbo/gumbo-0.10.1.ebuild +++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/gumbo/gumbo-0.11.0.ebuild b/dev-libs/gumbo/gumbo-0.11.0.ebuild new file mode 100644 index 000000000000..d9530b04ba6e --- /dev/null +++ b/dev-libs/gumbo/gumbo-0.11.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="The HTML5 parsing algorithm implemented as a pure C99 library" +HOMEPAGE="https://codeberg.org/grisha/gumbo-parser" +SRC_URI="https://codeberg.org/grisha/gumbo-parser/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/gumbo-parser" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/gtest )" +BDEPEND="doc? ( app-doc/doxygen )" + +src_prepare() { + default + eautoreconf +} + +src_compile() { + default + + if use doc; then + doxygen || die "doxygen failed" + HTML_DOCS=( docs/html/. ) + fi +} + +src_install() { + default + use doc && doman docs/man/man3/* + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/gumbo/metadata.xml b/dev-libs/gumbo/metadata.xml index a2faadedd5a5..bf5592871976 100644 --- a/dev-libs/gumbo/metadata.xml +++ b/dev-libs/gumbo/metadata.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>graaff@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">google/gumbo-parser#readme</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>contact@hacktivis.me</email> + <name>Haelwenn (lanodan) Monnier</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest index bee64ebd160c..285479f7ad3a 100644 --- a/dev-libs/hidapi/Manifest +++ b/dev-libs/hidapi/Manifest @@ -1,3 +1,4 @@ DIST hidapi-0.11.0.tgz 232631 BLAKE2B 770c0663b007aa36580af217d0d38be72923e0ad84cee137594ca3e174e589cebb9188003a50999e1c561b0e4e9ca68bd1af29029b89fde2b0a46020b12f9744 SHA512 0de4abc963600d159ce231416c468b9e81a8361e4d2c2202988d6eb2e58a923700e9b9be639fbddc6bc14625131848409e2e88dbc4b34a1f8a726c8fa4692d92 DIST hidapi-0.12.0.tgz 238751 BLAKE2B 25eddf337970275a026839dfe8c0c3beef58da892a6b192751f70faa7ca3ad12f9deab34c3800e053ef9bdefca481a863fac0c25aab51dbf172b44bd94e34e56 SHA512 866268927698db6fa553e000ead3c0c4b8df67ea768d36acac9c71f06f0bd8283778e90eee03f81aaa930f38dbb5719391906c7d2742b74479ffa436104f5fa4 DIST hidapi-0.13.1.tgz 244666 BLAKE2B b3406114f8dd8b192eecac1673592866f930688af8023819d20f73c76226f0829c8d68f4b47051b4836ce4348fc3bbad8f9849f1d565563dcd0f993df43de4ca SHA512 07b224b9b5146caf693e6d67514fed236436ed68f38a3ada98ebf8352dfaa4e175f576902affb4b79da1bb8c9b47a1ee0831a93c7d3d210e93faee24632f7d53 +DIST hidapi-0.14.0.tgz 348221 BLAKE2B 6472bfe5863d75a8901983a763191f3b6c18c25934b652b79f33141a6818619f816d35ed2480435254cecc51598d1e07e53c8c8c4f35a10cf28c1e4374bb450d SHA512 66a045144f90b41438898b82f0398e80223323ebfe6e4f197d2713696bb3ae60f36aea5a37a9999b34b12294783fd7e4c28c6e785462559cbe21276009da1eac diff --git a/dev-libs/hidapi/hidapi-0.13.1.ebuild b/dev-libs/hidapi/hidapi-0.13.1-r1.ebuild index 6f2ed465adcc..d2f94dbee7e0 100644 --- a/dev-libs/hidapi/hidapi-0.13.1.ebuild +++ b/dev-libs/hidapi/hidapi-0.13.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib +inherit cmake-multilib flag-o-matic DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices" HOMEPAGE="https://github.com/libusb/hidapi" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libusb/hidapi/archive/${P}.tar.gz -> ${P}.tgz" LICENSE="|| ( BSD GPL-3 HIDAPI )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" IUSE="doc" DEPEND=" @@ -23,6 +23,12 @@ BDEPEND=" S="${WORKDIR}/${PN}-${P}" +multilib_src_configure() { + append-lfs-flags + + cmake_src_configure +} + multilib_src_compile() { cmake_src_compile diff --git a/dev-libs/hidapi/hidapi-0.14.0.ebuild b/dev-libs/hidapi/hidapi-0.14.0.ebuild new file mode 100644 index 000000000000..7127187ea5b3 --- /dev/null +++ b/dev-libs/hidapi/hidapi-0.14.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices" +HOMEPAGE="https://github.com/libusb/hidapi" +SRC_URI="https://github.com/libusb/hidapi/archive/${P}.tar.gz -> ${P}.tgz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="|| ( BSD GPL-3 HIDAPI )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="doc" + +DEPEND=" + virtual/libusb:1[${MULTILIB_USEDEP}] + virtual/libudev:0[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( app-doc/doxygen )" + +multilib_src_configure() { + append-lfs-flags + + local mycmakeargs=( + # Doesn't do anything as of 0.14.0 + -DHIDAPI_WITH_TESTS=OFF + ) + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile + + if use doc && multilib_is_native_abi; then + cd "${S}/doxygen" || die + doxygen Doxyfile || die + fi +} + +multilib_src_install() { + cmake_src_install + + if use doc && multilib_is_native_abi; then + local HTML_DOCS=( "${S}/doxygen/html/." ) + fi + einstalldocs +} diff --git a/dev-libs/hidapi/metadata.xml b/dev-libs/hidapi/metadata.xml index f31807f17dda..2b526d40b73c 100644 --- a/dev-libs/hidapi/metadata.xml +++ b/dev-libs/hidapi/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>sultan@gentoo.org</email> - <name>Stephan Hartmann</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="fox">Build a <pkg>x11-libs/fox</pkg> GUI</flag> </use> diff --git a/dev-libs/hiredis/hiredis-1.0.2-r2.ebuild b/dev-libs/hiredis/hiredis-1.0.2-r3.ebuild index 6290e448af16..b990a555460f 100644 --- a/dev-libs/hiredis/hiredis-1.0.2-r2.ebuild +++ b/dev-libs/hiredis/hiredis-1.0.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,7 @@ src_compile() { # The static lib re-uses the same objects as the shared lib, so # overhead is low w/creating it all the time. It's also needed # by the tests. - _build dynamic static hiredis.pc + _build dynamic static hiredis{,_ssl}.pc } src_test() { diff --git a/dev-libs/hiredis/hiredis-1.1.0.ebuild b/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild index 4d173dd34c4d..193ec8133864 100644 --- a/dev-libs/hiredis/hiredis-1.1.0.ebuild +++ b/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild @@ -54,7 +54,7 @@ src_compile() { # The static lib re-uses the same objects as the shared lib, so # overhead is low w/creating it all the time. It's also needed # by the tests. - _build dynamic static hiredis.pc + _build dynamic static hiredis{,_ssl}.pc } src_test() { diff --git a/dev-libs/hyperscan/hyperscan-5.4.2.ebuild b/dev-libs/hyperscan/hyperscan-5.4.2.ebuild index c82f020ea277..7c6fac198c94 100644 --- a/dev-libs/hyperscan/hyperscan-5.4.2.ebuild +++ b/dev-libs/hyperscan/hyperscan-5.4.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake flag-o-matic python-any-r1 diff --git a/dev-libs/hyperscan/metadata.xml b/dev-libs/hyperscan/metadata.xml index c367a670c6e6..dc4b2f2b7d54 100644 --- a/dev-libs/hyperscan/metadata.xml +++ b/dev-libs/hyperscan/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="github">intel/hyperscan</remote-id> </upstream> diff --git a/dev-libs/hyprland-protocols/hyprland-protocols-0.2.ebuild b/dev-libs/hyprland-protocols/hyprland-protocols-0.2.ebuild index d042b8fb75ba..bd84f17c8f6a 100644 --- a/dev-libs/hyprland-protocols/hyprland-protocols-0.2.ebuild +++ b/dev-libs/hyprland-protocols/hyprland-protocols-0.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/hyprwm/hyprland-protocols" SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~riscv" LICENSE="BSD" SLOT="0" diff --git a/dev-libs/icinga-php-library/Manifest b/dev-libs/icinga-php-library/Manifest index f1f458399b0a..381ce67ae809 100644 --- a/dev-libs/icinga-php-library/Manifest +++ b/dev-libs/icinga-php-library/Manifest @@ -1,3 +1,4 @@ DIST icinga-php-library-0.10.0.tar.gz 2756161 BLAKE2B 327b9e2939dc4c511fb282faae0b7ca1801d22bd0fac38b9f694dc924e26d6bdd469d0118ef44e93a42d5480b2bb15ff5ec6aec19e00e5ae33c9c40d78643f9f SHA512 9619e5b68bb58f7f6264633ca1a24de84dcd78626d4675ecbf3fbe8601031ffcbc4c227e9029d5ad87e1be04cad562c93911fdcbda889046cdb9a416dd195530 +DIST icinga-php-library-0.13.0.tar.gz 3250696 BLAKE2B ba644fd02a165cef7167062a73b595aa3218748f6f937be4b666fcabe7536c6dd2f9747689c86e5f85ea3d38bcb6d4b9fbd30f2c883ce1678fb4f536fd91694d SHA512 e811b66f9550972fc64f435b3a8fc7d263a2c1d0db86d34dd0179ee5c78babb2e19cd934e53a46d4e860d0bdc336619e9b67824cc4273ea049bea321a176acd4 DIST icinga-php-library-0.6.1.tar.gz 2159137 BLAKE2B 93287845a6c06653faca1850b18c880d023d4bf22c707616a21b92bd252661c811a33c7515fbf19a06936358244c7703bae83cc2e44dee460fe7a46bfa82d345 SHA512 64800727e60630224993bda89494921a3e10f14ccb43b8f57d023b372806ce9253cdf7f6e933df8b494ef0369784714ac857fb288f7f08880c29e8643f25e2ec DIST icinga-php-library-0.8.1.tar.gz 2183054 BLAKE2B 56108f3251211c05ba29827ece49ea1b27bc22b0f0ae459a2f34d5f2ed106ebac1e14c15e1f69c4a3d862d163a0e1265ccb9e5ab0123e24a18e72549af1ee951 SHA512 3da7ad25c569651bc29757a89971d9dfce4cae177619ef70bcb93f1c155400b68ee8b76279b4914454edef41de0cb4d729c47446df622b04494987e0bf4e1098 diff --git a/dev-libs/icinga-php-library/icinga-php-library-0.13.0.ebuild b/dev-libs/icinga-php-library/icinga-php-library-0.13.0.ebuild new file mode 100644 index 000000000000..a4f2138aa497 --- /dev/null +++ b/dev-libs/icinga-php-library/icinga-php-library-0.13.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Icinga PHP libraries for Icinga Web 2" +HOMEPAGE="https://github.com/Icinga/icinga-php-library" +MY_GITHUB_AUTHOR="Icinga" +SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND="dev-lang/php:*" +RDEPEND="${DEPEND}" +BDEPEND="" + +src_install() { + insinto "/usr/share/icinga-php/ipl" + cd "${S}" + doins -r * +} diff --git a/dev-libs/icinga-php-thirdparty/Manifest b/dev-libs/icinga-php-thirdparty/Manifest index e0fa0aea78f9..af9673e72790 100644 --- a/dev-libs/icinga-php-thirdparty/Manifest +++ b/dev-libs/icinga-php-thirdparty/Manifest @@ -1,2 +1,3 @@ DIST icinga-php-thirdparty-0.10.0.tar.gz 576508 BLAKE2B 3e07262415340c413bf79aa3031cf3679f0374c85dad9c41ffed78f65379837fc87df8433ea201b02455bde5c1fee1406f5b149b9d5b39cd726407657bdafb54 SHA512 3f5b6caad23860cecf5f06d165b01211af5284cb3dcb635bdcf4c2118b03c96de40a6d86cd0bccbe0f817ae87cc5d09aa2709ca90f55b948cf975c69dc234e95 DIST icinga-php-thirdparty-0.11.0.tar.gz 764914 BLAKE2B b9fbe66252edf5f504feab16392c60f4edf142d3644d13c29ba4f0291df40f8b4e3163f6bb97d944827a8a3d88728b5bf1c05ad193a078f889ba917714746c00 SHA512 5a2b9218a0426de6b560845db36e8e113a8be786eaf4ab57ff4f5e0ef485dc426cb0f203b4b45c3b791adb852098b64f2a0099c9909506594502edb2b4d4ee35 +DIST icinga-php-thirdparty-0.12.0.tar.gz 14204157 BLAKE2B f8a084cf0299dcca2e90ef97982c46d38f8ccd1c25d87e7106b22f4b91f49f9bbed8c31bf51af10083be28283d93be8d54c083450fd9563f4cc09cf35cdb270a SHA512 c087261712d486fba026128d7fd06590e824024d192d4d5feea902dbdb7134fca7b0e1d82aa4a5246859ca55303a6aed40a57b5aaf37e6652abb68549c8c48ea diff --git a/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.12.0.ebuild b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.12.0.ebuild new file mode 100644 index 000000000000..9b47ddec8290 --- /dev/null +++ b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.12.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Icinga PHP libraries for Icinga Web 2" +HOMEPAGE="https://github.com/Icinga/icinga-php-thirdparty" +SRC_URI="https://github.com/Icinga/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND="dev-lang/php:*" +RDEPEND="${DEPEND}" +BDEPEND="" + +src_install() { + insinto "/usr/share/icinga-php/vendor" + cd "${S}" + doins -r * +} diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index 7f16aad1d836..8a1282d5e565 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1,4 +1,4 @@ -DIST icu4c-72_1-src.tgz 26303933 BLAKE2B 0eeaf6cf61c98ab93f2c7715607209b7741dcb806a98749a7172d004210b98c3528f84ca3c53400f7ed06ed90c6f6f3f55df3fead033c66c7e948697907343f9 SHA512 848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8 -DIST icu4c-72_1-src.tgz.asc 659 BLAKE2B 1d28948ee577ed9fe694c1e151da124df3567d81352465c76e8910848bb780e9fc9505c4a3795fde8f2f6e8f28a631f887fdecdc536286341b2b23ce423a7cbb SHA512 8b5e841a3baa317a13cadf7deb3582a80cfab8e5bdae6bd04612ee7be3006d9acf07b015de01a94990fa350109a3c11e547482e4cb4ca986161cc701a8cd427b -DIST icu4c-73_1-src.tgz 26512935 BLAKE2B 45de117efc4a49301c04a997963393967a70b8583abf1a9626331e275c5bc329cf2685de5c80b32f764c8ff2530b5594316d7119ce66503e5adba7842ca24424 SHA512 e788e372716eecebc39b56bbc88f3a458e21c3ef20631c2a3d7ef05794a678fe8dad482a03a40fdb9717109a613978c7146682e98ee16fade5668d641d5c48f8 -DIST icu4c-73_1-src.tgz.asc 833 BLAKE2B 2c0a02a109280c7994f3c9404473119105ccbe051633dd8dc89c14ff65612d7a18deccff2a525752808f26f34d7c192f9346a8c3a0d34af9aa2110744d9f863d SHA512 b7042b0e39e1ebfcef8573d3000088b32a740106c7cfd4c18ebd52e7fd22e64e07b174d766373b1722520369e937fc56d439a0b290a3efeee287b2740388c3d3 +DIST icu4c-73_2-src.tgz 26519906 BLAKE2B 3f7dec9d527939d6d594c92844a400733e43af018bbc2f600edcb18299211a2f2285332188976d15e1ef672191416abac0b95a9d1a2ea6ababdaddf12708ccef SHA512 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 +DIST icu4c-73_2-src.tgz.asc 659 BLAKE2B 83e082ba15ba7aeb366b6d97da15d076c200f9051e55bf00ba13265a3d87aade5a5b18c98a0c903d5015821c63e4b340ffbcc7940a654d169ad1948d6594ce63 SHA512 7598b8cc498ada8ca904b13f7aba27abd3f8f3013a0677d7ffab42d5413df9d2f0526107559301abc4049123b2e6d4d4f4cc589cbd943959d97b595dd57ea63c +DIST icu4c-74_1-src.tgz 26625850 BLAKE2B cf8277cd513bd99c85104669e617683e4a91280c4c15a396021289fe0093d64682466550a44a0115bcc9e7abf30e3108dbadfb46e85e832e4cfd689618968507 SHA512 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 +DIST icu4c-74_1-src.tgz.asc 659 BLAKE2B d95224933dc665f3c4e6f9cb81ab65d4755fc768161bf8abf97ba0d8ad350bc0ccfccdcb5c21d97b132e036bad960f6021283325c1ec836d2aecc5101af3c298 SHA512 45064eb2cf83dd7e3edc423c43914cc7fbcee38ad79e93c80da1e9e59e0554329a174cd6ef5a8055fe92220621eae9761f7de3b0cb311e5874efa41555e58396 diff --git a/dev-libs/icu-layoutex/icu-layoutex-72.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-73.2.ebuild index 0fbb37202844..938ec098df74 100644 --- a/dev-libs/icu-layoutex/icu-layoutex-72.1.ebuild +++ b/dev-libs/icu-layoutex/icu-layoutex-73.2.ebuild @@ -1,32 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Please bump with dev-libs/icu +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc +inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig -inherit autotools flag-o-matic multilib-minimal toolchain-funcs +MY_PV=${PV/_rc/-rc} +MY_PV=${MY_PV//./_} DESCRIPTION="External layout part of International Components for Unicode" HOMEPAGE="https://icu.unicode.org/" -if [[ ${PV} == *_rc* ]] ; then - SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-$(ver_rs 1- '-').tar.gz -> ${P/-layoutex}.tar.gz" - S="${WORKDIR}"/${PN/-layoutex}-release-$(ver_rs 1- '-')/icu4c/source -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc - inherit verify-sig - - SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz" - SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz.asc )" - S="${WORKDIR}"/${PN/-layoutex}/source +SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz" +SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" +S="${WORKDIR}"/${PN/-layoutex}/source +LICENSE="BSD" +SLOT="0/${PV%.*}.1" +if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" - - BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 )" fi - -LICENSE="BSD" -SLOT="0/${PV}" IUSE="debug static-libs test" RESTRICT="!test? ( test )" @@ -35,8 +29,9 @@ DEPEND=" dev-libs/icu-le-hb[${MULTILIB_USEDEP}] " RDEPEND="${DEPEND}" -BDEPEND+=" +BDEPEND=" virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) " PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" ) @@ -59,6 +54,8 @@ src_prepare() { } src_configure() { + MAKEOPTS+=" VERBOSE=1" + # ICU tries to append -std=c++11 without this, so as of 71.1, # despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17, # we still need this. @@ -127,7 +124,7 @@ multilib_src_test() { # -e: Exhaustive testing # -v: Increased verbosity pushd layoutex &>/dev/null || die - emake -j1 VERBOSE="1" check + emake VERBOSE="1" check popd &>/dev/null || die } diff --git a/dev-libs/icu-layoutex/icu-layoutex-73.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-74.1.ebuild index 1bc05984aaa4..001b87547622 100644 --- a/dev-libs/icu-layoutex/icu-layoutex-73.1.ebuild +++ b/dev-libs/icu-layoutex/icu-layoutex-74.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 # Please bump with dev-libs/icu -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig MY_PV=${PV/_rc/-rc} @@ -12,13 +12,12 @@ MY_PV=${MY_PV//./_} DESCRIPTION="External layout part of International Components for Unicode" HOMEPAGE="https://icu.unicode.org/" - SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz" SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" S="${WORKDIR}"/${PN/-layoutex}/source LICENSE="BSD" -SLOT="0/${PV}" +SLOT="0/${PV%.*}.1" if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi @@ -55,6 +54,8 @@ src_prepare() { } src_configure() { + MAKEOPTS+=" VERBOSE=1" + # ICU tries to append -std=c++11 without this, so as of 71.1, # despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17, # we still need this. @@ -122,9 +123,7 @@ multilib_src_test() { # CINTLTST_OPTS: cintltst options # -e: Exhaustive testing # -v: Increased verbosity - pushd layoutex &>/dev/null || die - emake -j1 VERBOSE="1" check - popd &>/dev/null || die + emake -C layoutex VERBOSE="1" check } multilib_src_install() { diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 7f16aad1d836..8a1282d5e565 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,4 +1,4 @@ -DIST icu4c-72_1-src.tgz 26303933 BLAKE2B 0eeaf6cf61c98ab93f2c7715607209b7741dcb806a98749a7172d004210b98c3528f84ca3c53400f7ed06ed90c6f6f3f55df3fead033c66c7e948697907343f9 SHA512 848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8 -DIST icu4c-72_1-src.tgz.asc 659 BLAKE2B 1d28948ee577ed9fe694c1e151da124df3567d81352465c76e8910848bb780e9fc9505c4a3795fde8f2f6e8f28a631f887fdecdc536286341b2b23ce423a7cbb SHA512 8b5e841a3baa317a13cadf7deb3582a80cfab8e5bdae6bd04612ee7be3006d9acf07b015de01a94990fa350109a3c11e547482e4cb4ca986161cc701a8cd427b -DIST icu4c-73_1-src.tgz 26512935 BLAKE2B 45de117efc4a49301c04a997963393967a70b8583abf1a9626331e275c5bc329cf2685de5c80b32f764c8ff2530b5594316d7119ce66503e5adba7842ca24424 SHA512 e788e372716eecebc39b56bbc88f3a458e21c3ef20631c2a3d7ef05794a678fe8dad482a03a40fdb9717109a613978c7146682e98ee16fade5668d641d5c48f8 -DIST icu4c-73_1-src.tgz.asc 833 BLAKE2B 2c0a02a109280c7994f3c9404473119105ccbe051633dd8dc89c14ff65612d7a18deccff2a525752808f26f34d7c192f9346a8c3a0d34af9aa2110744d9f863d SHA512 b7042b0e39e1ebfcef8573d3000088b32a740106c7cfd4c18ebd52e7fd22e64e07b174d766373b1722520369e937fc56d439a0b290a3efeee287b2740388c3d3 +DIST icu4c-73_2-src.tgz 26519906 BLAKE2B 3f7dec9d527939d6d594c92844a400733e43af018bbc2f600edcb18299211a2f2285332188976d15e1ef672191416abac0b95a9d1a2ea6ababdaddf12708ccef SHA512 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 +DIST icu4c-73_2-src.tgz.asc 659 BLAKE2B 83e082ba15ba7aeb366b6d97da15d076c200f9051e55bf00ba13265a3d87aade5a5b18c98a0c903d5015821c63e4b340ffbcc7940a654d169ad1948d6594ce63 SHA512 7598b8cc498ada8ca904b13f7aba27abd3f8f3013a0677d7ffab42d5413df9d2f0526107559301abc4049123b2e6d4d4f4cc589cbd943959d97b595dd57ea63c +DIST icu4c-74_1-src.tgz 26625850 BLAKE2B cf8277cd513bd99c85104669e617683e4a91280c4c15a396021289fe0093d64682466550a44a0115bcc9e7abf30e3108dbadfb46e85e832e4cfd689618968507 SHA512 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 +DIST icu4c-74_1-src.tgz.asc 659 BLAKE2B d95224933dc665f3c4e6f9cb81ab65d4755fc768161bf8abf97ba0d8ad350bc0ccfccdcb5c21d97b132e036bad960f6021283325c1ec836d2aecc5101af3c298 SHA512 45064eb2cf83dd7e3edc423c43914cc7fbcee38ad79e93c80da1e9e59e0554329a174cd6ef5a8055fe92220621eae9761f7de3b0cb311e5874efa41555e58396 diff --git a/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch b/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch deleted file mode 100644 index ea943873a82b..000000000000 --- a/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch +++ /dev/null @@ -1,82 +0,0 @@ -https://bugs.gentoo.org/904381 -https://unicode-org.atlassian.net/browse/ICU-22356 -https://github.com/unicode-org/icu/pull/2431 (what we originally applied) -https://github.com/unicode-org/icu/pull/2432 (this commit) -https://github.com/unicode-org/icu/commit/4fd9d6ce9a951e66e727b296138f22cd05479de1 - -From 4fd9d6ce9a951e66e727b296138f22cd05479de1 Mon Sep 17 00:00:00 2001 -From: Fredrik Roubert <roubert@google.com> -Date: Tue, 18 Apr 2023 23:39:28 +0200 -Subject: [PATCH] ICU-22356 Use ConstChar16Ptr to safely cast from UChar* to - char16_t*. - -This is necessary for this header file to be usable by clients that -define UCHAR_TYPE as a type not compatible with char16_t, eg. uint16_t. ---- a/common/unicode/ures.h -+++ b/common/unicode/ures.h -@@ -25,6 +25,7 @@ - #ifndef URES_H - #define URES_H - -+#include "unicode/char16ptr.h" - #include "unicode/utypes.h" - #include "unicode/uloc.h" - -@@ -812,7 +813,7 @@ inline UnicodeString - ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; -- const char16_t *r = ures_getString(resB, &len, status); -+ const char16_t *r = ConstChar16Ptr(ures_getString(resB, &len, status)); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -837,7 +838,7 @@ inline UnicodeString - ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; -- const char16_t* r = ures_getNextString(resB, &len, key, status); -+ const char16_t* r = ConstChar16Ptr(ures_getNextString(resB, &len, key, status)); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -859,7 +860,7 @@ inline UnicodeString - ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; -- const char16_t* r = ures_getStringByIndex(resB, indexS, &len, status); -+ const char16_t* r = ConstChar16Ptr(ures_getStringByIndex(resB, indexS, &len, status)); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -882,7 +883,7 @@ inline UnicodeString - ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; -- const char16_t* r = ures_getStringByKey(resB, key, &len, status); -+ const char16_t* r = ConstChar16Ptr(ures_getStringByKey(resB, key, &len, status)); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { ---- a/test/intltest/Makefile.in -+++ b/test/intltest/Makefile.in -@@ -70,7 +70,7 @@ numbertest_parse.o numbertest_doubleconversion.o numbertest_skeletons.o \ - static_unisets_test.o numfmtdatadriventest.o numbertest_range.o erarulestest.o \ - formattedvaluetest.o formatted_string_builder_test.o numbertest_permutation.o \ - units_data_test.o units_router_test.o units_test.o displayoptions_test.o \ --numbertest_simple.o -+numbertest_simple.o uchar_type_build_test.o - - DEPS = $(OBJECTS:.o=.d) - ---- /dev/null -+++ b/test/intltest/uchar_type_build_test.cpp -@@ -0,0 +1,7 @@ -+// © 2023 and later: Unicode, Inc. and others. -+// License & terms of use: http://www.unicode.org/copyright.html#License -+ -+// ICU-22356 Test that client code can be built with UCHAR_TYPE redefined. -+#undef UCHAR_TYPE -+#define UCHAR_TYPE uint16_t -+#include "unicode/ures.h" - diff --git a/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch b/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch deleted file mode 100644 index 7f3f6a8e472f..000000000000 --- a/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://bugs.gentoo.org/904381 -https://unicode-org.atlassian.net/browse/ICU-22356 -https://github.com/unicode-org/icu/pull/2431 - -From d58ab7c27c2f5ecb83a3fc3de5803dc42f807746 Mon Sep 17 00:00:00 2001 -From: Xi Ruoyao <xry111@xry111.site> -Date: Mon, 17 Apr 2023 15:33:18 +0800 -Subject: [PATCH] ICU-22356 Revert ICU-21833 change for ures.h - -These usages of UChar are in inline functions for calling C API functions, so they should not be changed to char16_t or the code will fail to compile with `-DUCHAR_TYPE=`. ---- a/common/unicode/ures.h -+++ b/common/unicode/ures.h -@@ -812,7 +812,7 @@ inline UnicodeString - ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; -- const char16_t *r = ures_getString(resB, &len, status); -+ const UChar *r = ures_getString(resB, &len, status); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -837,7 +837,7 @@ inline UnicodeString - ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; -- const char16_t* r = ures_getNextString(resB, &len, key, status); -+ const UChar* r = ures_getNextString(resB, &len, key, status); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -859,7 +859,7 @@ inline UnicodeString - ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; -- const char16_t* r = ures_getStringByIndex(resB, indexS, &len, status); -+ const UChar* r = ures_getStringByIndex(resB, indexS, &len, status); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -882,7 +882,7 @@ inline UnicodeString - ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; -- const char16_t* r = ures_getStringByKey(resB, key, &len, status); -+ const UChar* r = ures_getStringByKey(resB, key, &len, status); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { - diff --git a/dev-libs/icu/files/icu-73.2-fix-TestHebrewCalendarInTemporalLeapYear-test.patch b/dev-libs/icu/files/icu-73.2-fix-TestHebrewCalendarInTemporalLeapYear-test.patch new file mode 100644 index 000000000000..df4dd0793837 --- /dev/null +++ b/dev-libs/icu/files/icu-73.2-fix-TestHebrewCalendarInTemporalLeapYear-test.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/914887 +https://github.com/unicode-org/icu/commit/f3b869cbb0b9ced42d7ca4e24626a868a14ddcfc + +From f3b869cbb0b9ced42d7ca4e24626a868a14ddcfc Mon Sep 17 00:00:00 2001 +From: Frank Tang <ftang@chromium.org> +Date: Mon, 18 Sep 2023 20:20:42 -0700 +Subject: [PATCH] ICU-22512 Fix broken TestHebrewCalendarInTemporalLeapYear + +Fix broken test mistakenly landed in +https://github.com/unicode-org/icu/pull/2274 + +Some important steps were missed in the last landing. +--- a/test/intltest/caltest.cpp ++++ b/test/intltest/caltest.cpp +@@ -4028,6 +4028,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() { + for (gc.set(startYear, UCAL_JANUARY, 1); + gc.get(UCAL_YEAR, status) <= stopYear; + gc.add(UCAL_DATE, incrementDays, status)) { ++ cal->setTime(gc.getTime(status), status); + if (failure(status, "add/get/set/getTime/setTime incorrect")) return; + + int32_t cal_year = cal->get(UCAL_EXTENDED_YEAR, status); +@@ -4036,6 +4037,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() { + leapTest->set(UCAL_MONTH, 0); + leapTest->set(UCAL_DATE, 1); + // If 10 months after TISHRI is TAMUZ, then it is a leap year. ++ leapTest->add(UCAL_MONTH, 10, status); + hasLeapMonth = leapTest->get(UCAL_MONTH, status) == icu::HebrewCalendar::TAMUZ; + yearForHasLeapMonth = cal_year; + } + diff --git a/dev-libs/icu/icu-72.1.ebuild b/dev-libs/icu/icu-72.1.ebuild deleted file mode 100644 index c4141cbcefad..000000000000 --- a/dev-libs/icu/icu-72.1.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with dev-libs/icu-layoutex - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="https://icu.unicode.org/" -if [[ ${PV} == *_rc* ]] ; then - SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-$(ver_rs 1- '-').tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-release-$(ver_rs 1- '-')/icu4c/source -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc - inherit verify-sig - - SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz" - SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz.asc )" - S="${WORKDIR}"/${PN}/source - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - - BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 )" -fi - -LICENSE="BSD" -SLOT="0/${PV}" -IUSE="debug doc examples static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND+=" - ${PYTHON_DEPS} - sys-devel/autoconf-archive - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/icu-config -) - -PATCHES=( - "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" - "${FILESDIR}/${PN}-64.2-darwin.patch" - "${FILESDIR}/${PN}-68.1-nonunicode.patch" -) - -src_prepare() { - default - - # Disable renaming as it assumes stable ABI and that consumers - # won't use unofficial APIs. We need this despite the configure argument. - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - # Append doxygen configuration to configure - sed -i \ - -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - MAKEOPTS+=" VERBOSE=1" - - # ICU tries to append -std=c++11 without this, so as of 71.1, - # despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17, - # we still need this. - append-cxxflags -std=c++14 - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - --disable-samples - --disable-layoutex - $(use_enable debug) - $(use_enable static-libs static) - $(use_enable test tests) - $(multilib_native_use_enable examples samples) - ) - - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # Work around cross-endian testing failures with LTO #757681 - if tc-is-cross-compiler && is-flagq '-flto*' ; then - myeconfargs+=( --disable-strict ) - fi - - # ICU tries to use clang by default - tc-export CC CXX - - # Make sure we configure with the same shell as we run icu-config - # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined - export CONFIG_SHELL="${EPREFIX}/bin/sh" - # Probably have no /bin/sh in prefix-chain - [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}" - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen -u Doxyfile || die - doxygen Doxyfile || die - fi -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - emake -j1 check -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc; then - docinto html - dodoc -r doc/html/* - fi -} - -multilib_src_install_all() { - local HTML_DOCS=( ../readme.html ) - einstalldocs -} diff --git a/dev-libs/icu/icu-73.1.ebuild b/dev-libs/icu/icu-73.1.ebuild deleted file mode 100644 index a6d931245492..000000000000 --- a/dev-libs/icu/icu-73.1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with dev-libs/icu-layoutex - -PYTHON_COMPAT=( python3_{9..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc -inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig - -MY_PV=${PV/_rc/-rc} -MY_PV=${MY_PV//./_} - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="https://icu.unicode.org/" -SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz" -SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" -S="${WORKDIR}"/${PN}/source - -# Keyword with boost-1.82 -if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -fi -LICENSE="BSD" -SLOT="0/${PV}" -IUSE="debug doc examples static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - sys-devel/autoconf-archive - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/icu-config -) - -PATCHES=( - "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" - "${FILESDIR}/${PN}-64.2-darwin.patch" - "${FILESDIR}/${PN}-68.1-nonunicode.patch" -) - -src_prepare() { - default - - # Disable renaming as it assumes stable ABI and that consumers - # won't use unofficial APIs. We need this despite the configure argument. - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - # Append doxygen configuration to configure - sed -i \ - -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - MAKEOPTS+=" VERBOSE=1" - - # ICU tries to append -std=c++11 without this, so as of 71.1, - # despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17, - # we still need this. - append-cxxflags -std=c++14 - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - --disable-samples - --disable-layoutex - $(use_enable debug) - $(use_enable static-libs static) - $(use_enable test tests) - $(multilib_native_use_enable examples samples) - ) - - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # Work around cross-endian testing failures with LTO #757681 - if tc-is-cross-compiler && is-flagq '-flto*' ; then - myeconfargs+=( --disable-strict ) - fi - - # ICU tries to use clang by default - tc-export CC CXX - - # Make sure we configure with the same shell as we run icu-config - # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined - export CONFIG_SHELL="${EPREFIX}/bin/sh" - # Probably have no /bin/sh in prefix-chain - [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}" - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen -u Doxyfile || die - doxygen Doxyfile || die - fi -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - emake -j1 check -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc; then - docinto html - dodoc -r doc/html/* - fi -} - -multilib_src_install_all() { - local HTML_DOCS=( ../readme.html ) - einstalldocs -} diff --git a/dev-libs/icu/icu-73.1-r2.ebuild b/dev-libs/icu/icu-73.2.ebuild index 4c34b239cbab..870eed474993 100644 --- a/dev-libs/icu/icu-73.1-r2.ebuild +++ b/dev-libs/icu/icu-73.2.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Please bump with dev-libs/icu-layoutex PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig MY_PV=${PV/_rc/-rc} @@ -18,12 +18,11 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" S="${WORKDIR}"/${PN}/source -# Keyword with boost-1.82 if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD" -SLOT="0/${PV}" +SLOT="0/${PV%.*}.1" IUSE="debug doc examples static-libs test" RESTRICT="!test? ( test )" @@ -43,7 +42,7 @@ PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" "${FILESDIR}/${PN}-64.2-darwin.patch" "${FILESDIR}/${PN}-68.1-nonunicode.patch" - "${FILESDIR}/${PN}-73.1-fix-UChar-api-deux.patch" + "${FILESDIR}/${P}-fix-TestHebrewCalendarInTemporalLeapYear-test.patch" ) src_prepare() { @@ -97,6 +96,9 @@ multilib_src_configure() { local myeconfargs=( --disable-renaming --disable-samples + # TODO: Merge with dev-libs/icu-layoutex + # Planned to do this w/ 73.2 but seem to get test failures + # only with --enable-layoutex. --disable-layoutex $(use_enable debug) $(use_enable static-libs static) @@ -104,11 +106,23 @@ multilib_src_configure() { $(multilib_native_use_enable examples samples) ) + #if use test ; then + # myeconfargs+=( + # --enable-extras + # --enable-tools + # ) + #else + # myeconfargs+=( + # $(multilib_native_enable extras) + # $(multilib_native_enable tools) + # ) + #fi + tc-is-cross-compiler && myeconfargs+=( --with-cross-build="${WORKDIR}"/host ) - # Work around cross-endian testing failures with LTO #757681 + # Work around cross-endian testing failures with LTO, bug #757681 if tc-is-cross-compiler && is-flagq '-flto*' ; then myeconfargs+=( --disable-strict ) fi @@ -145,7 +159,7 @@ multilib_src_test() { # CINTLTST_OPTS: cintltst options # -e: Exhaustive testing # -v: Increased verbosity - emake -j1 check + emake check } multilib_src_install() { diff --git a/dev-libs/icu/icu-73.1-r1.ebuild b/dev-libs/icu/icu-74.1.ebuild index c8c62931c741..2b16d0d0702a 100644 --- a/dev-libs/icu/icu-73.1-r1.ebuild +++ b/dev-libs/icu/icu-74.1.ebuild @@ -5,8 +5,8 @@ EAPI=8 # Please bump with dev-libs/icu-layoutex -PYTHON_COMPAT=( python3_{9..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig MY_PV=${PV/_rc/-rc} @@ -18,12 +18,11 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" S="${WORKDIR}"/${PN}/source -# Keyword with boost-1.82 if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD" -SLOT="0/${PV}" +SLOT="0/${PV%.*}.1" IUSE="debug doc examples static-libs test" RESTRICT="!test? ( test )" @@ -43,7 +42,6 @@ PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" "${FILESDIR}/${PN}-64.2-darwin.patch" "${FILESDIR}/${PN}-68.1-nonunicode.patch" - "${FILESDIR}/${PN}-73.1-fix-UChar-api.patch" ) src_prepare() { @@ -97,6 +95,9 @@ multilib_src_configure() { local myeconfargs=( --disable-renaming --disable-samples + # TODO: Merge with dev-libs/icu-layoutex + # Planned to do this w/ 73.2 but seem to get test failures + # only with --enable-layoutex. --disable-layoutex $(use_enable debug) $(use_enable static-libs static) @@ -104,11 +105,23 @@ multilib_src_configure() { $(multilib_native_use_enable examples samples) ) + #if use test ; then + # myeconfargs+=( + # --enable-extras + # --enable-tools + # ) + #else + # myeconfargs+=( + # $(multilib_native_enable extras) + # $(multilib_native_enable tools) + # ) + #fi + tc-is-cross-compiler && myeconfargs+=( --with-cross-build="${WORKDIR}"/host ) - # Work around cross-endian testing failures with LTO #757681 + # Work around cross-endian testing failures with LTO, bug #757681 if tc-is-cross-compiler && is-flagq '-flto*' ; then myeconfargs+=( --disable-strict ) fi @@ -145,7 +158,7 @@ multilib_src_test() { # CINTLTST_OPTS: cintltst options # -e: Exhaustive testing # -v: Increased verbosity - emake -j1 check + emake check } multilib_src_install() { diff --git a/dev-libs/iksemel/iksemel-1.4-r1.ebuild b/dev-libs/iksemel/iksemel-1.4-r2.ebuild index e74f7323fa59..dc67c8484ffd 100644 --- a/dev-libs/iksemel/iksemel-1.4-r1.ebuild +++ b/dev-libs/iksemel/iksemel-1.4-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -12,11 +12,11 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="ssl static-libs" +IUSE="ssl" RDEPEND="ssl? ( net-libs/gnutls:= )" -DEPEND="${RDEPEND} - ssl? ( virtual/pkgconfig )" +DEPEND="${RDEPEND}" +BDEPEND="ssl? ( virtual/pkgconfig )" PATCHES=( "${FILESDIR}"/${PN}-1.3-gnutls-2.8.patch @@ -30,9 +30,7 @@ src_prepare() { } src_configure() { - econf \ - $(use_with ssl gnutls) \ - $(use_enable static-libs static) + econf $(use_with ssl gnutls) } src_install() { @@ -40,5 +38,5 @@ src_install() { dodoc HACKING # package installs .pc files - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest index 1749003e6e69..0c1d8253aabe 100644 --- a/dev-libs/imath/Manifest +++ b/dev-libs/imath/Manifest @@ -1 +1,2 @@ -DIST imath-3.1.7.tar.gz 583049 BLAKE2B 54619339f349a944e1d72fcea4438d7bd2ef6c9655ba0e16ac608934a8df30c97a2f3cf5c75adaeb8a6fe6bf19ec3240c11439550b452571d0a8cbf75d6bd83e SHA512 e298454cb845cadde28f7881fdaa4739c3942f941278a07ec912459ac376c2ee7858cb3b2d2047b9afb4d4dacae7a8a52ffef4c104f8499b4e0a1f0ed46cc0f0 +DIST imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd +DIST imath-3.1.9.tar.gz 598497 BLAKE2B fe3afce26c19f5ddace3c420f9b83caca7b4c75902820fc2182ef9fb9f4d27581f27ca72262b63d65f794eeb73af55782412ba846d142072e0090ff7224d8960 SHA512 ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564 diff --git a/dev-libs/imath/imath-3.1.7.ebuild b/dev-libs/imath/imath-3.1.6.ebuild index 2e490284d2c3..f1bce4102c11 100644 --- a/dev-libs/imath/imath-3.1.7.ebuild +++ b/dev-libs/imath/imath-3.1.6.ebuild @@ -12,23 +12,20 @@ MY_PN="${PN^}" DESCRIPTION="Imath basic math package" HOMEPAGE="https://imath.readthedocs.io" SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -# re-keywording needed for (according to ilmbase keywords): ~x64-macos +# re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="BSD" -SLOT="3/30" -IUSE="large-stack python test" +SLOT="3/29" +IUSE="doc large-stack python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" # blocker due to file collision #803347 RDEPEND=" - !dev-libs/imath:0 - !media-libs/ilmbase sys-libs/zlib python? ( - !dev-python/pyilmbase ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-libs/boost:=[python,${PYTHON_USEDEP}] @@ -39,6 +36,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig + doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') ) python? ( ${PYTHON_DEPS} ) " @@ -50,14 +48,11 @@ pkg_setup() { src_configure() { local mycmakeargs=( - # requires press theme, not available in ::gentoo - -DBUILD_DOCS=OFF + -DDOCS=$(usex doc) -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) - # the following options are at their default value -DIMATH_HALF_USE_LOOKUP_TABLE=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_USE_CLANG_TIDY=OFF - -DIMATH_USE_DEFAULT_VISIBILITY=OFF -DIMATH_USE_NOEXCEPT=ON ) if use python; then diff --git a/dev-libs/imath/imath-3.1.9.ebuild b/dev-libs/imath/imath-3.1.9.ebuild new file mode 100644 index 000000000000..aea484a270f9 --- /dev/null +++ b/dev-libs/imath/imath-3.1.9.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 + +MY_PN="${PN^}" + +DESCRIPTION="Imath basic math package" +HOMEPAGE="https://imath.readthedocs.io" +SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="BSD" +SLOT="3/29" +IUSE="large-stack python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +# blocker due to file collision #803347 +RDEPEND=" + sys-libs/zlib + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + python? ( ${PYTHON_DEPS} ) +" + +DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + # requires press theme, not available in ::gentoo + -DBUILD_DOCS=OFF + -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) + # the following options are at their default value + -DIMATH_HALF_USE_LOOKUP_TABLE=ON + -DIMATH_INSTALL_PKG_CONFIG=ON + -DIMATH_USE_CLANG_TIDY=OFF + -DIMATH_USE_DEFAULT_VISIBILITY=OFF + -DIMATH_USE_NOEXCEPT=ON + ) + if use python; then + mycmakeargs+=( + -DBoost_NO_BOOST_CMAKE=OFF + -DPYTHON=ON + -DPython3_EXECUTABLE="${PYTHON}" + -DPython3_INCLUDE_DIR=$(python_get_includedir) + -DPython3_LIBRARY=$(python_get_library_path) + ) + fi + + cmake_src_configure +} diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest index 99f535bd88e4..eee67f4d9c04 100644 --- a/dev-libs/inih/Manifest +++ b/dev-libs/inih/Manifest @@ -1 +1,2 @@ DIST inih-56.tar.gz 18458 BLAKE2B 51935959a9eb4e393b17302f0932a232963883680f10d404c63d5f2ebbd3bf0b740f44edfa1b2541d0e130016eb853ebedf68a1c40797f658496e2a8c966af3d SHA512 ff3e0910990f73e5b21fddc84737ab346279f201c86c7ad864c6cad9de5bde57c3e0a433b9b8f3585b7d86feaae2ea074185f92891dcadc98c274c1c0745d2d2 +DIST inih-57.tar.gz 18954 BLAKE2B df2e2a14b4186616071f6ad2a64e0423148fb9a4624a74d4b16845a4a12eb72b1965f1314b92a710b80cc68d85dbe4ef09d6db159b76be856a4041f21a8c520c SHA512 9f758df876df54ed7e228fd82044f184eefbe47e806cd1e6d62e1b0ea28e2c08e67fa743042d73b4baef0b882480e6afe2e72878b175822eb2bdbb6d89c0e411 diff --git a/dev-libs/inih/inih-57.ebuild b/dev-libs/inih/inih-57.ebuild new file mode 100644 index 000000000000..bb6473c9f6c9 --- /dev/null +++ b/dev-libs/inih/inih-57.ebuild @@ -0,0 +1,30 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Tests not wired up to meson and don't seem to be intended for downstream use yet +# e.g. hardcoding gcc, just a shell script + +inherit meson + +DESCRIPTION="inih (INI not invented here) simple .INI file parser" +HOMEPAGE="https://github.com/benhoyt/inih" +SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/inih-r${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +DOCS=( README.md ) + +src_configure() { + local emesonargs=( + -Ddefault_library=shared + -Ddistro_install=true + -Dwith_INIReader=true + ) + + meson_src_configure +} diff --git a/dev-libs/iniparser/files/iniparser-4.1-CVE-null-getstring.patch b/dev-libs/iniparser/files/iniparser-4.1-CVE-null-getstring.patch new file mode 100644 index 000000000000..bf3c035fda07 --- /dev/null +++ b/dev-libs/iniparser/files/iniparser-4.1-CVE-null-getstring.patch @@ -0,0 +1,43 @@ +From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001 +From: Antonio <antoniolrt@gmail.com> +Date: Fri, 2 Jun 2023 15:03:10 -0300 +Subject: [PATCH] Handle null return from iniparser_getstring + +Fix handling of NULL returns from iniparser_getstring in +iniparser_getboolean, iniparser_getlongint and iniparser_getdouble, +avoiding a crash. +--- + src/iniparser.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iniparser.c b/src/iniparser.c +index f1d1658..dbceb20 100644 +--- a/src/iniparser.c ++++ b/src/iniparser.c +@@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n + const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (str==INI_INVALID_KEY) return notfound ; ++ if (str==NULL || str==INI_INVALID_KEY) return notfound ; + return strtol(str, NULL, 0); + } + +@@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou + const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (str==INI_INVALID_KEY) return notfound ; ++ if (str==NULL || str==INI_INVALID_KEY) return notfound ; + return atof(str); + } + +@@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound) + const char * c ; + + c = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (c==INI_INVALID_KEY) return notfound ; ++ if (c==NULL || c==INI_INVALID_KEY) return notfound ; + if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') { + ret = 1 ; + } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') { diff --git a/dev-libs/iniparser/iniparser-4.1-r1.ebuild b/dev-libs/iniparser/iniparser-4.1-r1.ebuild new file mode 100644 index 000000000000..9f6dc0ddcee4 --- /dev/null +++ b/dev-libs/iniparser/iniparser-4.1-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="A free stand-alone ini file parsing library" +HOMEPAGE="https://github.com/ndevilla/iniparser" +SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="4" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples" + +BDEPEND="doc? ( app-doc/doxygen )" + +PATCHES=( + ${FILESDIR}/${P}-CVE-null-getstring.patch # upstream, bug #907928 +) + +_newlib_so_with_symlinks() { + local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" + + newlib.so ${source} ${base}.so.${current}.${revision}.${age} + local i + for i in ".${current}" '' ; do + dosym ${base}.so.${current}.${revision}.${age} /usr/$(get_libdir)/${base}.so${i} + done +} + +src_prepare() { + default + rm -r html || die +} + +src_configure() { + append-lfs-flags +} + +_emake() { + emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \ + SO_TARGET=lib${PN}${SLOT}.so.1 \ + ADDITIONAL_CFLAGS= \ + "$@" +} + +src_compile() { + _emake +} + +src_test() { + _emake -C test +} + +src_install() { + _newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0 + + insinto /usr/include/${PN}${SLOT} + doins src/*.h + + if use doc; then + emake -C doc + HTML_DOCS=( html/. ) + fi + + if use examples; then + docinto examples + dodoc -r example/. + docompress -x /usr/share/doc/${PF}/examples + fi + + einstalldocs +} diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml index d34e989567aa..3b48e648fba0 100644 --- a/dev-libs/iniparser/metadata.xml +++ b/dev-libs/iniparser/metadata.xml @@ -5,10 +5,6 @@ <email>samba@gentoo.org</email> <name>Samba Team</name> </maintainer> - <maintainer type="person"> - <email>grobian@gentoo.org</email> - <name>Fabian Groffen</name> - </maintainer> <upstream> <remote-id type="github">ndevilla/iniparser</remote-id> </upstream> diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest index 0d585aedc090..84d04b2a4978 100644 --- a/dev-libs/intel-compute-runtime/Manifest +++ b/dev-libs/intel-compute-runtime/Manifest @@ -1,2 +1 @@ -DIST intel-compute-runtime-23.13.26032.26.tar.gz 6487863 BLAKE2B a483ea321f905fe61bbefed52b7c1505c5e00b82625092066800cd7064d635b667da31938c9d2ae2e4627ec2332732f6cff2feb1187c1773d96b38a8ae9bc341 SHA512 c552ddceac5385883949c0e3f58ea27cfa766a6fafdf8928775ae1bc601cf8dc8274fddbd98ffc36d3fcf61bfdd40bac5a51d07d072dc313cdcfc49382dbcc66 -DIST intel-compute-runtime-23.17.26241.15.tar.gz 6556461 BLAKE2B 3814d5d24b0a79ebadda0f3ee5d1d3b414e9fb26e8c693ba66449a9f0500c8ec2e11533aa02142757e5177ad4c5efc5dd61a9c7db5a883a2cf4e9faab599ab4b SHA512 bd648fa964a15df76d1694af138f7c383239ccc5061cdd7faac0c45da3cffe95441614026b9bddfb86790446042ccc1d4abc3ecc023c50a036835598076a77bb +DIST intel-compute-runtime-23.35.27191.9.tar.gz 6856146 BLAKE2B 02676adde05bef374f12ca6d6baac1a577ae32b712e77bf01e09d6cc01a2eeeb4d6eacc8fb302e350aca34f9d70f07a20ac70a52a682bdefb06223c4b6611cf7 SHA512 39abd4830ce379894bd9f17e2a1685b6403ddd13bae1fb1549c11de3e4b26536adfb24194c245466c45ba01c9d89c5d69bb60fbb498d9c23c24d31b018a37af8 diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.17.26241.15.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.17.26241.15.ebuild deleted file mode 100644 index fadfb30dc042..000000000000 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.17.26241.15.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" -MY_PN="${PN/intel-/}" -MY_P="${MY_PN}-${PV}" - -inherit cmake flag-o-matic - -DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver" -HOMEPAGE="https://github.com/intel/compute-runtime" -SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+l0 +vaapi" - -RDEPEND=">=media-libs/gmmlib-22.3.5:=" - -DEPEND=" - ${DEPEND} - dev-libs/intel-metrics-discovery:= - dev-libs/intel-metrics-library:= - dev-libs/libnl:3 - dev-libs/libxml2:2 - >=dev-util/intel-graphics-compiler-1.0.13860.4 - >=dev-util/intel-graphics-system-controller-0.8.7:= - media-libs/mesa - >=virtual/opencl-3 - l0? ( >=dev-libs/level-zero-1.11.0:= ) - vaapi? ( - x11-libs/libdrm[video_cards_intel] - media-libs/libva - ) -" - -BDEPEND="virtual/pkgconfig" - -DOCS=( "README.md" "FAQ.md" ) - -PATCHES=( - "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" -) - -src_prepare() { - # Remove '-Werror' from default - sed -e '/Werror/d' -i CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # See https://github.com/intel/compute-runtime/issues/531 - filter-lto - - local mycmakeargs=( - -DCCACHE_ALLOWED="OFF" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" - -DBUILD_WITH_L0="$(usex l0)" - -DDISABLE_LIBVA="$(usex !vaapi)" - -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include" - -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include" - -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors" - -DSUPPORT_DG1="ON" - -Wno-dev - - # See https://github.com/intel/intel-graphics-compiler/issues/204 - # -DNEO_DISABLE_BUILTINS_COMPILATION="ON" - - # If enabled, tests are automatically run during - # the compile phase and we cannot run them because - # they require permissions to access the hardware. - -DSKIP_UNIT_TESTS="1" - ) - - cmake_src_configure -} diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.26.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.35.27191.9.ebuild index 893db4b58b43..1a6f3bed6576 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.26.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.35.27191.9.ebuild @@ -27,11 +27,11 @@ DEPEND=" dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 - >=dev-util/intel-graphics-compiler-1.0.13860.4 - >=dev-util/intel-graphics-system-controller-0.8.7:= + >=dev-util/intel-graphics-compiler-1.0.15136.4 + >=dev-util/intel-graphics-system-controller-0.8.13:= media-libs/mesa >=virtual/opencl-3 - l0? ( >=dev-libs/level-zero-1.11.0:= ) + l0? ( >=dev-libs/level-zero-1.14.0:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest index 05fdbbdedb8f..543896aac958 100644 --- a/dev-libs/intel-metrics-discovery/Manifest +++ b/dev-libs/intel-metrics-discovery/Manifest @@ -1 +1 @@ -DIST metrics-discovery-1.12.164.tar.gz 4235286 BLAKE2B f2a707fd2b43e096ad1c02032558c141add286d9f8cef20a317f5109245328ae7d22dd1acec64df99ef17dd652e67e5cba8db0e3271dd2259138924218ef893a SHA512 8e8e00d75ba14abecd9c650c0f5a33dd8f46396e8ed4f2a4eefb1b76b87cfc38ad47740dddd00698c09055a79e12ac2a4b23187c0b6146b4ef0745b21f0bf975 +DIST metrics-discovery-1.12.165.1.tar.gz 4908502 BLAKE2B 2869869d4830881e6894cdef54c13cfbc0c956e93a373617c84da6fee3bcb6dc915df77b16c3296d8bd651a2e76714a632689f927cd1717095bc7aa31ad7d77f SHA512 8293d497e2197f8dba95e690703d0440dfa40b7c16c91a9a1748b985f2bfe8603c0bb20dec5d31132b025d301f1d5492f5993e2870f4a5e04aac7b84b9734522 diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.165.1.ebuild index 457d080c331c..e9827e7a4117 100644 --- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild +++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.165.1.ebuild @@ -10,7 +10,7 @@ MY_P="${MY_PN}-${PV}" inherit cmake DESCRIPTION="A user mode library that provides access to GPU performance data" -HOMEPAGE="https://github.com/intel/compute-runtime" +HOMEPAGE="https://github.com/intel/metrics-discovery" SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz" S="${WORKDIR}/${MY_PN}-${MY_P}" diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest index 548400db30cf..83745f33bba9 100644 --- a/dev-libs/intel-metrics-library/Manifest +++ b/dev-libs/intel-metrics-library/Manifest @@ -1 +1 @@ -DIST intel-metrics-library-0_pre20230417.tar.gz 248881 BLAKE2B 83b3fb48fcb01668bda98c3a5fff1829d89686dd2731163f24a43614ac6b21c2f618be9d2f80115e2ceeffc4df0880e2dfea72a9255d3430f60a88ecd66a8893 SHA512 1b5878528e2146c9811b43b74ddb94f14b1127dc0e6231cc4ff0993d528c8ccea4d9ba52a8e50b409eb9f0e9776cbe04df7c0d1e94a8cf7020b97b822b430c13 +DIST metrics-library-1.0.133.tar.gz 248109 BLAKE2B c7d4444710e0f55bb930497891822f11ffb90ed115a9b7f8eac6128c2914b59a0628173f0b8d644418793a82bd5ae87753eaaf9efb0363a18717c811505c3fa6 SHA512 7b16cad2ddae7e9a2c38e408df378e0263e30e04365cec0554a8351b47455b63308564f65c37b8504f4f1bbd50ebd18e4e81470a010076c6f1805f4908389b25 diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.133.ebuild index 9940af2c6e7c..3a47e9b8afd5 100644 --- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild +++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.133.ebuild @@ -4,7 +4,6 @@ EAPI=8 CMAKE_BUILD_TYPE="Release" -EGIT_COMMIT="5524ef74cf0423006992a52571590cb8bc2d7468" MY_PN="${PN/intel-/}" MY_P="${MY_PN}-${PV}" @@ -12,11 +11,11 @@ inherit cmake DESCRIPTION="User mode driver helper library that provides access to GPU performance counters" HOMEPAGE="https://github.com/intel/metrics-library" -SRC_URI="https://github.com/intel/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}" +SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${MY_P}" LICENSE="MIT" -SLOT="0/133" +SLOT="0/${PV}" KEYWORDS="amd64" DEPEND="x11-libs/libdrm" diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest index 7f4fca732c5c..ed31c1781fb6 100644 --- a/dev-libs/intel-vc-intrinsics/Manifest +++ b/dev-libs/intel-vc-intrinsics/Manifest @@ -1,2 +1 @@ -DIST intel-vc-intrinsics-0.12.1.tar.gz 139995 BLAKE2B ad5f76873eecf580552f2ef99ff502ad79f87edc43fa4e444983973c439d0090e9e7c48c5453edb1dd204bb656e2f30e7a1c262f965e4b87ce38cc7a466d5938 SHA512 ccba1e024e7b49b64139f21841060f183d5f329d1dc25163af65302679aef60dd2c0cb3a1afa41155de714629b0f1b19a98ba837a720bfa235bcaf8635fa181a -DIST intel-vc-intrinsics-0.12.3.tar.gz 140736 BLAKE2B ea01f108679d4e44f65c7e298b727a3d4cba80a98b15a330aaf88785dd7d958d02eeeb632a59c3494d0eaf063654209e36aab6323eae8deb6280095e571b4ea4 SHA512 b816ebd5b6778c63b2a97d93afbd9eb63e43e229b37abf4913186940d707e4132cf3dd60d252e3c73e7b9e9707606bec41e2dfacc421d37f13fef950476b697b +DIST intel-vc-intrinsics-0.13.0.tar.gz 142690 BLAKE2B e4069a873d566748e8f8d32acb99ce3ccb504acd3d974b60f8ffb2ea79f5ff99667b153f23bcc40b5f93da43b6adf073aa6ad94f0234a167b8813079496e7441 SHA512 209fab98b614317823a28ebdcde38bcdd653508d315c7fc3a52d75fe05587871f200e5136398ff3e37488b8457ea398a844b92ccb51bf3adea1975d99779c3b6 diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.3.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.3.ebuild deleted file mode 100644 index 0fb48b3f3aba..000000000000 --- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" -LLVM_MAX_SLOT="15" -MY_PN="${PN/intel-/}" -MY_P="${MY_PN}-${PV}" -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake llvm python-any-r1 - -DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions" -HOMEPAGE="https://github.com/intel/vc-intrinsics" -SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - dev-libs/libxml2:2= - sys-devel/llvm:${LLVM_MAX_SLOT} - sys-libs/zlib -" -RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - ) - - cmake_src_configure -} diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.1-r1.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.13.0.ebuild index 2b261917684a..00f30b995677 100644 --- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.1-r1.ebuild +++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.13.0.ebuild @@ -7,7 +7,7 @@ CMAKE_BUILD_TYPE="Release" LLVM_MAX_SLOT="15" MY_PN="${PN/intel-/}" MY_P="${MY_PN}-${PV}" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake llvm python-any-r1 diff --git a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild index 0b993e7daf1a..5d8fbc1d2c4b 100644 --- a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild +++ b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}. LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" IUSE="cpu_flags_x86_avx512f" # AVX512 support in yasm is still work in progress diff --git a/dev-libs/isl/isl-0.26.ebuild b/dev-libs/isl/isl-0.26.ebuild index 3dd32d52f091..96dbce5b2ff6 100644 --- a/dev-libs/isl/isl-0.26.ebuild +++ b/dev-libs/isl/isl-0.26.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://libisl.sourceforge.io/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0/23" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]" diff --git a/dev-libs/ivykis/ivykis-0.42.4.ebuild b/dev-libs/ivykis/ivykis-0.42.4.ebuild index 12b76ae9a612..a6a90eaa1e4a 100644 --- a/dev-libs/ivykis/ivykis-0.42.4.ebuild +++ b/dev-libs/ivykis/ivykis-0.42.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,9 @@ src_prepare() { } src_configure() { - econf $(use_enable static-libs static) + econf \ + --cache-file="${S}"/config.cache \ + $(use_enable static-libs static) } src_install() { diff --git a/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch b/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch new file mode 100644 index 000000000000..0da70dc5afcb --- /dev/null +++ b/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch @@ -0,0 +1,55 @@ +From https://github.com/akheron/jansson/pull/666/commits/1e2ac681e5f39fc7a7e8b8deb2162a93976d4622 Mon Sep 17 00:00:00 2001 +From: Violet Purcell <vimproved@inventati.org> +Date: Wed, 11 Oct 2023 20:51:57 -0400 +Subject: [PATCH] Port check for --default-symver to autoconf + +This commit ports the configure check for -Wl,--default-symver that is +present in CMake to autoconf. This fixes building Jansson via autoconf +with non-bfd linkers on glibc systems. + +Signed-off-by: Violet Purcell <vimproved@inventati.org> +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,9 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT8_T + AC_TYPE_LONG_LONG_INT + ++jansson_soversion="4" ++AC_SUBST([jansson_soversion]) ++ + AC_C_INLINE + case $ac_cv_c_inline in + yes) json_inline=inline;; +@@ -138,8 +141,12 @@ AS_IF([test "x$with_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbol + AC_SUBST(JSON_BSYMBOLIC_LDFLAGS) + + # Enable symbol versioning on GNU libc ++m4_pattern_forbid([^AX_CHECK_LINK_FLAG$]) + JSON_SYMVER_LDFLAGS= +-AC_CHECK_DECL([__GLIBC__], [JSON_SYMVER_LDFLAGS=-Wl,--default-symver]) ++AC_CHECK_DECL([__GLIBC__], ++ [AX_CHECK_LINK_FLAG([-Wl,--default-symver], ++ [JSON_SYMVER_LDFLAGS=-Wl,--default-symver], ++ [JSON_SYMVER_LDFLAGS=-Wl,--version-script,$ac_abs_confdir/jansson.sym])]) + AC_SUBST([JSON_SYMVER_LDFLAGS]) + + AC_ARG_ENABLE([ossfuzzers], +@@ -168,6 +175,7 @@ AC_SUBST([AM_CFLAGS]) + + AC_CONFIG_FILES([ + jansson.pc ++ jansson.sym + Makefile + doc/Makefile + src/Makefile +--- /dev/null ++++ b/jansson.sym.in +@@ -0,0 +1,5 @@ ++JANSSON_@jansson_soversion@ { ++ global: ++ *; ++}; ++ +-- +2.42.0 + diff --git a/dev-libs/jansson/jansson-2.14-r2.ebuild b/dev-libs/jansson/jansson-2.14-r2.ebuild new file mode 100644 index 000000000000..8f8601ce9046 --- /dev/null +++ b/dev-libs/jansson/jansson-2.14-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="C library for encoding, decoding and manipulating JSON data" +HOMEPAGE="https://www.digip.org/jansson/" +SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +IUSE="doc static-libs" + +BDEPEND=" + sys-devel/autoconf-archive + doc? ( dev-python/sphinx ) +" + +PATCHES=( + "${FILESDIR}/${P}-default-symver-test.patch" + "${FILESDIR}/${P}-test-symbols.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_compile() { + default + + if use doc ; then + emake html + HTML_DOCS=( doc/_build/html/. ) + fi +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest index 9b849e98dc5f..e421914e9088 100644 --- a/dev-libs/json-c/Manifest +++ b/dev-libs/json-c/Manifest @@ -1 +1,2 @@ DIST json-c-0.16.tar.gz 351916 BLAKE2B 11457fa39330338c85bfdfb0dd38fc703ad6942e730ba090c9fe017dfb81ef905d7b1bb1c768b9b51f6445a8cf3cf4007d7740be3a9878f8062edc62ba554c66 SHA512 255cff99033340b2c2678255d41dae7808f83ed0c102e693d2d9e186bd1f21dd1385fcaa360c0fc087a00965a9567fbda733370e6b518a9be2f1bb0a80439151 +DIST json-c-0.17.tar.gz 390045 BLAKE2B 26be25141447f2b652fa09d7096141a8bf7992469bcc53b275c1bc0108fc36a8898a8185c381218d3146d00fa03bdd0b837be073410fc93af943b5f083dbaa69 SHA512 4cbedd559502bf9014cfcd1d0bb8bb80d2abac4e969d95d4170123cd9cbafb0756b913fdbb83f666d14f674d6539a60ed1c5d0eb03c36b8037a2e00dc1636e19 diff --git a/dev-libs/json-c/json-c-0.17.ebuild b/dev-libs/json-c/json-c-0.17.ebuild new file mode 100644 index 000000000000..4f44e489c9b1 --- /dev/null +++ b/dev-libs/json-c/json-c-0.17.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="A JSON implementation in C" +HOMEPAGE="https://github.com/json-c/json-c/wiki" +SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/5" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="cpu_flags_x86_rdrand static-libs threads" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/json-c/config.h +) + +multilib_src_configure() { + local mycmakeargs=( + # apps are not installed, so disable unconditionally. + # https://github.com/json-c/json-c/blob/json-c-0.17-20230812/apps/CMakeLists.txt#L119...L121 + -DBUILD_APPS=OFF + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DDISABLE_EXTRA_LIBS=ON + -DDISABLE_WERROR=ON + -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand) + -DENABLE_THREADING=$(usex threads) + ) + + cmake_src_configure +} + +multilib_src_test() { + multilib_is_native_abi && cmake_src_test +} + +multilib_src_install_all() { + HTML_DOCS=( "${S}"/doc/html/. ) + einstalldocs +} diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild index d1cd5a7aa95a..57cba100cf9c 100644 --- a/dev-libs/json-c/json-c-9999.ebuild +++ b/dev-libs/json-c/json-c-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib git-r3 +inherit cmake-multilib git-r3 multibuild DESCRIPTION="A JSON implementation in C" HOMEPAGE="https://github.com/json-c/json-c/wiki" @@ -21,11 +21,14 @@ MULTILIB_WRAPPED_HEADERS=( multilib_src_configure() { local mycmakeargs=( - -DDISABLE_WERROR=ON + # apps are not installed, so disable unconditionally. + # https://github.com/json-c/json-c/blob/json-c-0.17-20230812/apps/CMakeLists.txt#L119...L121 + -DBUILD_APPS=OFF + -DBUILD_STATIC_LIBS=$(usex static-libs) -DDISABLE_EXTRA_LIBS=ON - -DENABLE_THREADING=$(usex threads) + -DDISABLE_WERROR=ON -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand) - -DBUILD_STATIC_LIBS=$(usex static-libs) + -DENABLE_THREADING=$(usex threads) ) cmake_src_configure @@ -33,14 +36,18 @@ multilib_src_configure() { multilib_src_compile() { cmake_src_compile - use doc && doxygen doc/Doxyfile + if use doc && multilib_is_native_abi; then + cmake_build doc + fi } multilib_src_test() { multilib_is_native_abi && cmake_src_test } -multilib_src_install_all() { - use doc && HTML_DOCS=( "${BUILD_DIR}-abi_x86_64.amd64"/doc/html/. ) - einstalldocs +multilib_src_install() { + if multilib_is_native_abi; then + use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + einstalldocs + fi } diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest index 512f29b5a12e..09e85bb0bbdd 100644 --- a/dev-libs/json-glib/Manifest +++ b/dev-libs/json-glib/Manifest @@ -1 +1,2 @@ DIST json-glib-1.6.6.tar.xz 1306232 BLAKE2B 93814dad74ef61ef265e348e9e145ceb63c950f1e9ecda23fbaad24e291a1cbfc690e287ccc8959fd7c056634f80815ef54fa2c75b09ebd3e158f3fa4df1c8e7 SHA512 b9a737e4ba3ecdfb9cb8f5fb751cc74e5b1553664d3088c44a1f9e5396d4037958af214dcd290ddf5af98088f46167e10e371e134e1de5cbb7aec84c5c0fd017 +DIST json-glib-1.8.0.tar.xz 157300 BLAKE2B eef0344c353bb9288efb700a6041342379627b924a042263e011f21140166b57b108f6816e80ac692159b49943f9c1afeb722efafa34e8c60f2fcdf53a0dc034 SHA512 e4fe16bb7c5b72fcf9c0966ac1903ff0cd74ec8eab891db4b94e92353bdcb57b24613b6c2cce7bfa1996603c367d1b4939c12209369dfb915aac0f3804a3a900 diff --git a/dev-libs/json-glib/json-glib-1.8.0.ebuild b/dev-libs/json-glib/json-glib-1.8.0.ebuild new file mode 100644 index 000000000000..08ef50b661fc --- /dev/null +++ b/dev-libs/json-glib/json-glib-1.8.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org meson-multilib xdg-utils + +DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format" +HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="gtk-doc +introspection nls test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.54.0:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +DEPEND="${RDEPEND}" +# TODO: Can we use a newer docbook-xml-dtd, or is one needed at all? +BDEPEND=" + ~app-text/docbook-xml-dtd-4.1.2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/glib-utils + gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" + +src_prepare() { + xdg_environment_reset + default + + # Disable installed-tests; this also indirectly removes + # build_aux/gen-installed-test.py calls, thus not needing + # python-any-r1.eclass + sed -e 's/install: true/install: false/g' -i json-glib/tests/meson.build || die + sed -e '/install_data/d' -i json-glib/tests/meson.build || die +} + +multilib_src_configure() { + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + + $(meson_native_use_feature introspection) + $(meson_native_use_feature gtk-doc gtk_doc) + $(meson_native_true man) + + $(meson_feature nls) + $(meson_use test tests) + ) + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + if use gtk-doc ; then + # Move to location that <devhelp-41 will see, reconsider once devhelp-41 is stable + mkdir -p "${ED}"/usr/share/gtk-doc/html || die + mv "${ED}"/usr/share/doc/json-glib-1.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} diff --git a/dev-libs/json-glib/metadata.xml b/dev-libs/json-glib/metadata.xml index a753ac3849a1..489464083a6c 100644 --- a/dev-libs/json-glib/metadata.xml +++ b/dev-libs/json-glib/metadata.xml @@ -24,6 +24,9 @@ classes for direct serialization into, and deserialization from, JSON data streams. </longdescription> + <use> + <flag name="nls">Enable native language support (translations)</flag> + </use> <upstream> <remote-id type="gnome-gitlab">GNOME/json-glib</remote-id> </upstream> diff --git a/dev-libs/json-parser/metadata.xml b/dev-libs/json-parser/metadata.xml index 4580bd57e5b3..7cd44cd50b42 100644 --- a/dev-libs/json-parser/metadata.xml +++ b/dev-libs/json-parser/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="github">json-parser/json-parser</remote-id> </upstream> diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.44.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.44.0.ebuild index 77ac37bbd786..96f429f0afcd 100644 --- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.44.0.ebuild +++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.44.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib" LICENSE="LGPL-2.1+" SLOT="0/1" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="gtk-doc +introspection test vala" REQUIRED_USE=" diff --git a/dev-libs/judy/metadata.xml b/dev-libs/judy/metadata.xml index 61d3437afe43..a6a6cd45139a 100644 --- a/dev-libs/judy/metadata.xml +++ b/dev-libs/judy/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>grknight@gentoo.org</email> - <name>Brian Evans</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">judy</remote-id> </upstream> diff --git a/dev-libs/kasync/Manifest b/dev-libs/kasync/Manifest deleted file mode 100644 index 78213d647eba..000000000000 --- a/dev-libs/kasync/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kasync-0.3.0.tar.xz 29060 BLAKE2B 0d2eeeeb296db7162426848c5467ee51e3530f0cef97cc345231fbde3225bc29736458c7e62938c7c9773742a9e4d3ed1f9545ac9d570cc5324321bc4e694e3a SHA512 a521862bafdff2931a3f01ef4393c6ae8f3c4655bb58dc2ddb4fde5f443d67b1a23d0c21491b2099ad6dae53d8894588b49299c45d334956b36ccedf94b17f9d diff --git a/dev-libs/kasync/kasync-0.3.0.ebuild b/dev-libs/kasync/kasync-0.3.0.ebuild deleted file mode 100644 index 2823530b43bc..000000000000 --- a/dev-libs/kasync/kasync-0.3.0.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -inherit ecm kde.org - -DESCRIPTION="C++ library for controlling asynchronous tasks" -HOMEPAGE="https://api.kde.org/kasync/html/index.html" |