diff options
Diffstat (limited to 'dev-libs')
890 files changed, 15577 insertions, 8965 deletions
diff --git a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild b/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild deleted file mode 100644 index a505928cb56c..000000000000 --- a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# 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=135412d2646f3bd753c8f1cfd33616110bbccd27 - -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="test" - -DEPEND=" - ~dev-libs/asmjit-2021.11.13 - dev-libs/cpuinfo -" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-cpp/gtest ) - ${PYTHON_DEPS} -" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - # Bug #855668 - filter-lto - - rm test/RowWiseSparseAdagradFusedTest.cc || die - rm test/SparseAdagradTest.cc || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DFBGEMM_LIBRARY_TYPE=shared - -DFBGEMM_BUILD_BENCHMARKS=OFF - -DFBGEMM_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild index 9a2f09a92e45..22674b795e6c 100644 --- a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild +++ b/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) inherit python-any-r1 flag-o-matic cmake -CommitId=7d59e803359eb323598e572700db27de467b705a +CommitId=03b2046676707da64504e898490ab46104d4682a DESCRIPTION="Facebook GEneral Matrix Multiplication" HOMEPAGE="https://github.com/pytorch/FBGEMM" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="test" +IUSE="doc test" DEPEND=" >=dev-libs/asmjit-2022.07.02 @@ -25,14 +25,32 @@ DEPEND=" 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}"/${PN}-2022.01.13-gentoo.patch + "${FILESDIR}"/${PN}-2022.07.16-gcc13.patch + "${FILESDIR}"/${P}-test.patch ) src_prepare() { @@ -52,7 +70,12 @@ 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 5fd675cbb2ad..5ca7cee0d7e4 100644 --- a/dev-libs/FBGEMM/Manifest +++ b/dev-libs/FBGEMM/Manifest @@ -1,2 +1 @@ -DIST FBGEMM-2022.01.13.tar.gz 532297 BLAKE2B bced7e1a1712351a87762e8d0a28ed3bbc5678c8ce70b440e769e53dc15f68e3ec8c89df9307f33da788bd376613720892493c0b519d3860a6e2edb48de1fdba SHA512 a416c2c11b0e6798e0dbb376050ead79cb602cd4f0e41b6109eeefe3e939e410adf0ce828d1224a358eb8245a935cc431d8023ccc396f08ca88276fb91c66157 -DIST FBGEMM-2022.07.16.tar.gz 744470 BLAKE2B d1ee51ad72a22fb1b7abaefe330f70e27bc5d6dfda2587373d7e0209aef099ab10c8772612a9786fc2bd760f66154053b9e6c9a6b7f3c82ed2114536f7b30213 SHA512 7d245ea47c57c2da0555693624c45c8585aab5d1b171c9f3b909e140d9d0964cb9cf8f029c291c45f8070d5cfad6f7116e606fdd4120b2223279e39d4ba3f189 +DIST FBGEMM-2023.02.10.tar.gz 854918 BLAKE2B 2af11baf95c1f33e1b1dd6f2a51dde2c991ff0f606402a7aaa539b7bc505c3707cafaa96d8f742c91672ec09a1f18a69f0e69c012b6db11d5297d602b8f4860c SHA512 a59d928150d674c56b5d38f73e62b5f4e2b527ea1f7ebb891ea1d3356e4183e0f469d145fca37fcb1c85f8773cf54226a8e41389fe9783474c457a7bd31846d6 diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch index e2aacd3f65ef..9ff87d5b6cb4 100644 --- a/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch +++ b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt 2022-05-21 13:13:50.806813151 +0200 +++ b/CMakeLists.txt 2022-05-21 13:16:46.448969453 +0200 -@@ -165,7 +165,7 @@ +@@ -187,7 +187,7 @@ message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") message(WARNING "==========") @@ -9,8 +9,8 @@ #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" -@@ -184,7 +184,7 @@ - set_property(TARGET asmjit PROPERTY POSITION_INDEPENDENT_CODE ON) +@@ -216,7 +216,7 @@ + endif() endif() -if(NOT TARGET cpuinfo) @@ -18,7 +18,7 @@ #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" -@@ -261,7 +261,6 @@ +@@ -293,7 +293,6 @@ target_link_libraries(fbgemm $<BUILD_INTERFACE:asmjit> $<BUILD_INTERFACE:cpuinfo>) @@ -26,7 +26,7 @@ install(TARGETS fbgemm EXPORT fbgemmLibraryConfig ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -268,6 +268,8 @@ +@@ -302,6 +301,8 @@ install(FILES ${FBGEMM_PUBLIC_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm") @@ -45,7 +45,7 @@ #Download Googletest framework from github if #GOOGLETEST_SOURCE_DIR is not specified. if(NOT DEFINED GOOGLETEST_SOURCE_DIR) -@@ -62,7 +62,6 @@ +@@ -67,7 +67,6 @@ target_link_libraries(${TESTNAME} ${OpenMP_CXX_LIBRARIES}) endif() diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch new file mode 100644 index 000000000000..cba259688d96 --- /dev/null +++ b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch @@ -0,0 +1,10 @@ +--- a/include/fbgemm/UtilsAvx2.h 2023-03-11 17:17:28.365325199 +0100 ++++ b/include/fbgemm/UtilsAvx2.h 2023-03-11 17:18:06.076766162 +0100 +@@ -9,6 +9,7 @@ + // flags. + + #include <string> ++#include <cstdint> + + namespace fbgemm { + diff --git a/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch b/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch new file mode 100644 index 000000000000..062887a01819 --- /dev/null +++ b/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch @@ -0,0 +1,11 @@ +--- a/test/CMakeLists.txt 2023-04-12 07:53:37.904871157 +0200 ++++ b/test/CMakeLists.txt 2023-04-12 07:53:56.597572954 +0200 +@@ -39,7 +39,7 @@ + QuantizationHelpers.cc + TestUtils.cc) + set_target_properties(${TESTNAME} PROPERTIES +- CXX_STANDARD 11 ++ CXX_STANDARD 14 + CXX_EXTENSIONS NO) + #To compile test files with AVX2 turned on + #For static build, defining FBGEMM_STATIC to avoid generating diff --git a/dev-libs/FP16/FP16-2021.03.20-r2.ebuild b/dev-libs/FP16/FP16-2021.03.20-r3.ebuild index b9dca4b566b5..4e21e1d10fc3 100644 --- a/dev-libs/FP16/FP16-2021.03.20-r2.ebuild +++ b/dev-libs/FP16/FP16-2021.03.20-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-r1 cmake CommitId=0a92994d729ff76a58f692d3028ca1b64b145d91 diff --git a/dev-libs/FXdiv/FXdiv-2020.12.09.ebuild b/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild index b55cbcd18709..454495945d21 100644 --- a/dev-libs/FXdiv/FXdiv-2020.12.09.ebuild +++ b/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,6 +26,14 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +src_prepare() { + cmake_src_prepare + + # >=dev-cpp/gtest-1.13.0 requires C++14 standard or later + sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/g' \ + CMakeLists.txt || die "sed failed" +} + src_configure() { local mycmakeargs=( -DFXDIV_BUILD_BENCHMARKS=OFF diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild deleted file mode 100644 index d7ea1ea0d531..000000000000 --- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) - -RUBY_OPTIONAL="yes" -USE_RUBY="ruby27" - -PHP_EXT_NAME="IcePHP" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -PHP_EXT_OPTIONAL_USE=php - -USE_PHP="php7-4" - -# This variable does not belong to any eclass. It is solely used in this ebuild -BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 ) - -inherit db-use mono-env 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.6.4.pdf )" -LICENSE="GPL-2" -SLOT="0/36" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="debug doc examples +readline mono php python ruby test" -RESTRICT="test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=dev-libs/expat-2.0.1 - >=app-arch/bzip2-1.0.5 - dev-libs/openssl:0= - virtual/libcrypt:= - || ( - $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done) - ) - dev-cpp/libmcpp - python? ( ${PYTHON_DEPS} ) - ruby? ( $(ruby_implementation_depend ruby27) ) - mono? ( dev-lang/mono )" -DEPEND="${RDEPEND} - readline? ( sys-libs/readline:0= ) - test? ( - ${PYTHON_DEPS} - dev-python/passlib[${PYTHON_USEDEP}] - )" - -# Maintainer notes: -# TODO: java bindings - -S="${WORKDIR}/${P,}" -PHP_EXT_S="${S}/php" - -PATCHES=( - "${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch" - "${FILESDIR}/${P}-db6.patch" - "${FILESDIR}/${P}-csharp.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|-L\$\(libdir\)||' \ - cpp/config/Make.rules || die - - sed -i \ - -e 's|-O2 ||g' \ - -e 's|-Werror ||g' \ - cpp/config/Make.rules.Linux || die - - sed -i \ - -e 's|install-common||' \ - {cpp,csharp,php,python,ruby}/Makefile || die - - sed -i \ - -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \ - csharp/config/Make.rules.cs || die - - # skip mono tests, bug #498484 - sed -i \ - -e '/SUBDIRS/s|\ test||' \ - csharp/Makefile || die - - # skip udp test due to multicast - # skip IceGrid/admin bug #649850 - # skip IceSSL tests due to requirement of internet connection - # skip IceStorm/single bug #636834 - # IceUtil/stacktrace and IceStorm/stress fail with USE=debug - # Glacier2/staticFiltering requires network access - sed -i \ - -e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \ - cpp/Makefile || die - - # fails even on unicode locale - sed -i \ - -e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \ - ruby/Makefile || die - - # fix for x86 IceBox test - sed -i \ - -e 's|"32"|""|' \ - scripts/TestUtil.py || die -} - -src_configure() { - suitable_db_version() { - local ver - for ver in "${BERKDB_SLOTS[@]}"; do - if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then - echo "${ver}" - return 0 - fi - done - die "No suitable BerkDB versions found, aborting" - } - - MAKE_RULES=( - "prefix=\"${ED}/usr\"" - "install_docdir=\"${ED}/usr/share/doc/${PF}\"" - "install_configdir=\"${ED}/usr/share/${P}/config\"" - "install_mandir=\"${ED}/usr/share/man/man1\"" - "embedded_runpath_prefix=\"${EPREFIX}/usr\"" - "LP64=yes" - "new_dtags=yes" - "NOTEST=$(usex !test)" - "USE_READLINE=$(usex readline)" - "OPTIMIZE=$(usex !debug)" - ) - - local BERKDB_VERSION="$(suitable_db_version)" - MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})") - sed -i \ - -e "s|g++|$(tc-getCXX)|" \ - -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \ - -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \ - -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \ - -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \ - cpp/config/Make.rules{,.Linux} python/config/Make.rules || die - - if use python; then - local S="${S}/python" - python_copy_sources - fi - - if use ruby; then - SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" - SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" - MAKE_RULES_RUBY=( - "install_rubydir=\"${ED}/${SITERUBY}\"" - "install_libdir=\"${ED}/${SITERUBYARCH}\"" - ) - - # make it use ruby26 only - sed -i \ - -e 's|RUBY = ruby|\026|' \ - ruby/config/Make.rules || die - sed -i \ - -e 's|env ruby|\026|' \ - ruby/config/s2rb.rb || die - sed -i \ - -e 's|env ruby|\026|' \ - ruby/scripts/slice2rb || die - sed -i \ - -e 's|output.write("ruby|\026|' \ - scripts/TestUtil.py || die - fi - - MAKE_RULES_MONO=( - "GACINSTALL=yes" - "GAC_ROOT=\"${ED}/usr/$(get_libdir)\"" - "GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\"" - "install_libdir=\"${ED}/usr/$(get_libdir)\"" - "install_pkgconfigdir=\"${ED}/usr/$(get_libdir)/pkgconfig\"" - ) - - if has_version ">dev-lang/mono-4"; then - MAKE_RULES_MONO+=("MCS=mcs") - 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[@]}" USE_NAMESPACES=yes "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 - - if use mono; then - emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" - 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="\"${D}/$(python_get_sitedir)\"" \ - install_libdir="\"${D}/$(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 - - if use mono; then - # skip mono tests, bug #498484 - ewarn "Tests for C# are currently disabled." - #emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test - fi -} - -src_install() { - local DOCS=( CHANGELOG*.md README.md ) - use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" ) - einstalldocs - - insinto /usr/share/${P} - doins -r slice - - emake -C cpp "${MAKE_RULES[@]}" 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/${PHP_EXT_NAME}.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[@]}" \ - 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 - dodir "${SITERUBY}" - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install - fi - - if use mono; then - emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install - fi -} diff --git a/dev-libs/Ice/Ice-3.7.8-r1.ebuild b/dev-libs/Ice/Ice-3.7.8-r1.ebuild index 40345ee3fabd..4def5e25988d 100644 --- a/dev-libs/Ice/Ice-3.7.8-r1.ebuild +++ b/dev-libs/Ice/Ice-3.7.8-r1.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/Ice/Ice-3.7.8.ebuild b/dev-libs/Ice/Ice-3.7.8.ebuild deleted file mode 100644 index a512d98ba711..000000000000 --- a/dev-libs/Ice/Ice-3.7.8.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="ruby27" - -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 ruby27) )" -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="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" - SITERUBYARCH="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" - MAKE_RULES_RUBY=( - "install_rubydir=\"${EPREFIX}/${SITERUBY}\"" - "install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\"" - ) - - # make it use ruby27 only - sed -i \ - -e 's|RUBY ?= ruby|\027|' \ - ruby/config/Make.rules || die - sed -i \ - -e 's|env ruby|\027|' \ - ruby/config/s2rb.rb || die - sed -i \ - -e 's|env ruby|\027|' \ - 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/Manifest b/dev-libs/Ice/Manifest index a626ec223234..933d0fc9164c 100644 --- a/dev-libs/Ice/Manifest +++ b/dev-libs/Ice/Manifest @@ -1,4 +1,2 @@ -DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0 -DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b DIST Ice-3.7.1.pdf 9351739 BLAKE2B 527f2c37aea19aedbfc580efd93ce4fae2eb7264342bb485822593e2da6fb75a61eea2b1a46187898af07f138d10bf9a213d0b2a0685c18cd1d4c624709a935b SHA512 199b59f14b87b2896ba970bf5aa32f6fd858cbd3fed18eac93acafe4e296db1361ca2d2000ed49f3390ed66c1d4ff8c1fcd3f14ab8197d7804c87fce422c8486 DIST Ice-3.7.8.tar.gz 11056950 BLAKE2B 66686d6e66a997badef53ee30782775047a2fa39d70fa8ed73c5e7a1bad3c3899efd8d68f557a416caacd65860a73834a6bdc3188730fa19a3f1e47f028c5e21 SHA512 eb5863cb5e83000199c27a5a505a19e5f1ec05e8575eb9cdc03f6db30447212e3b02e6adc70fb2ae6ddc63cfd93bc2b6b290f38919364ee9f08b238a0aa11e88 diff --git a/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch b/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch deleted file mode 100644 index 149a31e1dd6c..000000000000 --- a/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ice-3.6.3/cpp/config/Make.rules.Linux~ 2015-06-27 16:56:56.000000000 +0200 -+++ ice-3.6.3/cpp/config/Make.rules.Linux 2015-06-27 17:23:45.810591931 +0200 -@@ -79,19 +79,6 @@ - CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED - endif - -- # -- # Only use multilib -m32/-m64 options for amd64 arch, x32 arch can also run -- # in amd64 macines but doesn't use multilib, in this case MACHINE_TYPE will -- # be x86_64 and HOST_ARCH x32. -- # -- ifeq ($(HOST_ARCH),amd64) -- ifeq ($(LP64),yes) -- CXXARCHFLAGS += -m64 -- else -- CXXARCHFLAGS += -m32 -- endif -- endif -- - CXXFLAGS += $(CXXARCHFLAGS) -fvisibility=hidden -Wall -Werror -pthread - - # If MAXWARN is set then enable extra warnings ---- ice-3.6.3/config/Make.common.rules~ 2015-06-23 17:30:20.000000000 +0200 -+++ ice-3.6.3/config/Make.common.rules 2015-06-28 01:53:57.149666595 +0200 -@@ -101,25 +101,7 @@ - ifeq ($(LP64),) - LP64 = yes - endif -- -- # -- # x86 binaries build on x86_64 machine use 32 binsuffix -- # -- ifneq ($(STATICLIBS),yes) -- ifneq ($(LP64),yes) -- binsuffix = 32 -- endif -- endif - endif -- -- # -- # x86 builds uses 32 binsuffix -- # -- ifneq ($(STATICLIBS),yes) -- ifeq ($(findstring $(MACHINE_TYPE),i386 i486 i586 i686),$(MACHINE_TYPE)) -- binsuffix = 32 -- endif -- endif - endif - - ifeq ($(CPP11),yes) diff --git a/dev-libs/Ice/files/Ice-3.6.5-csharp.patch b/dev-libs/Ice/files/Ice-3.6.5-csharp.patch deleted file mode 100644 index cfdc1f6a8d47..000000000000 --- a/dev-libs/Ice/files/Ice-3.6.5-csharp.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ice-3.6.5/csharp/src/Makefile~ 2015-06-23 17:30:20.000000000 +0200 -+++ ice-3.6.5/csharp/src/Makefile 2015-06-27 20:07:04.217188211 +0200 -@@ -11,7 +11,7 @@ - - include $(top_srcdir)/config/Make.rules.cs - --SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceDiscovery IceLocatorDiscovery -+SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceSSL IceDiscovery IceLocatorDiscovery - - $(EVERYTHING):: - @for subdir in $(SUBDIRS); \ ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.5/csharp/lib/pkgconfig/IceSSL.pc 2015-06-27 20:19:30.731894653 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.5 -+mono_root = /usr -+ -+name = IceSSL -+ -+Name: ${name} -+Description: IceSSL run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.5/csharp/lib/pkgconfig/IceDiscovery.pc 2015-06-27 20:20:44.312515987 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.5 -+mono_root = /usr -+ -+name = IceDiscovery -+ -+Name: ${name} -+Description: IceDiscovery run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.5/csharp/lib/pkgconfig/IceLocatorDiscovery.pc 2015-06-27 20:21:22.206185123 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.5 -+mono_root = /usr -+ -+name = IceLocatorDiscovery -+ -+Name: ${name} -+Description: IceLocatorDiscovery run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} diff --git a/dev-libs/Ice/files/Ice-3.6.5-db6.patch b/dev-libs/Ice/files/Ice-3.6.5-db6.patch deleted file mode 100644 index b78fae76a453..000000000000 --- a/dev-libs/Ice/files/Ice-3.6.5-db6.patch +++ /dev/null @@ -1,48 +0,0 @@ -Avoid ambiguous ctor call (uint32_t vs DB_ENV*) with db 6.x. - ---- ice-3.6.3/cpp/src/Freeze/SharedDbEnv.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ ice-3.6.3/cpp/src/Freeze/SharedDbEnv.cpp 2017-06-28 18:42:43.411869639 +0200 -@@ -530,7 +530,7 @@ - { - if(_env == 0) - { -- _envHolder.reset(new DbEnv(0)); -+ _envHolder.reset(new DbEnv(0u)); - _env = _envHolder.get(); - - if(_trace >= 1) ---- ice-3.6.3/cpp/src/FreezeScript/transformdb.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ ice-3.6.3/cpp/src/FreezeScript/transformdb.cpp 2017-06-28 19:15:03.928514164 +0200 -@@ -766,8 +766,8 @@ - // - // Transform the database. - // -- DbEnv dbEnv(0); -- DbEnv dbEnvNew(0); -+ DbEnv dbEnv(0u); -+ DbEnv dbEnvNew(0u); - Freeze::TransactionPtr txNew; - Freeze::ConnectionPtr connection; - Freeze::ConnectionPtr connectionNew; ---- ice-3.6.3/cpp/src/FreezeScript/Util.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ ice-3.6.3/cpp/src/FreezeScript/Util.cpp 2017-06-28 19:22:29.318509063 +0200 -@@ -209,7 +209,7 @@ - { - CatalogDataMap result; - -- DbEnv dbEnv(0); -+ DbEnv dbEnv(0u); - try - { - #ifdef _WIN32 ---- ice-3.6.3/cpp/src/FreezeScript/DumpDB.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ ice-3.6.3/cpp/src/FreezeScript/DumpDB.cpp 2017-06-28 19:33:38.555168088 +0200 -@@ -481,7 +481,7 @@ - FreezeScript::ObjectFactoryPtr objectFactory = new FreezeScript::ObjectFactory; - communicator->addObjectFactory(objectFactory, ""); - -- DbEnv dbEnv(0); -+ DbEnv dbEnv(0u); - DbTxn* txn = 0; - Freeze::ConnectionPtr connection; - int status = EXIT_SUCCESS; diff --git a/dev-libs/aml/Manifest b/dev-libs/aml/Manifest index 5910a49a25cb..908594ea00c8 100644 --- a/dev-libs/aml/Manifest +++ b/dev-libs/aml/Manifest @@ -1 +1 @@ -DIST aml-0.2.2.tar.gz 20442 BLAKE2B 3ea4e03ba511096fc02db628d2591ddf247f79ccdf7638614a2a20fe74dfa563b555662492d976371b407ab013bbb83c193c047fca48f7f08b05cf47e6a87ab4 SHA512 3cb5bf28186a9056b579dd76440202837d96a7abde9427c45a810068d5e051c642303cd73b012e3b093ffb1577896753a50fcc508b2a30c49146033bb74156e7 +DIST aml-0.3.0.tar.gz 21070 BLAKE2B 09b8818ba63eb0f8c36e90385ee0787cad45b80c71cfcf439f93560f56269d52468bbdd2c0e8ad6cbf78b8fd0dd715aa107bfeb3918f55671ffca3f8daab56e3 SHA512 7c3347ef47ace8a14860e2b46937c8ade3712aa75a8c36845594fb4fa6ca26c35320b5234574accff451ea8302f23075acbe1a1b0392f5fbcbbbda20640be1fd diff --git a/dev-libs/aml/aml-0.2.2.ebuild b/dev-libs/aml/aml-0.3.0.ebuild index f455ef42c8e7..a7c7dfbf2a1a 100644 --- a/dev-libs/aml/aml-0.2.2.ebuild +++ b/dev-libs/aml/aml-0.3.0.ebuild @@ -22,12 +22,16 @@ IUSE="examples" DEPEND="elibc_musl? ( sys-libs/queue-standalone )" +PATCHES=( + "${FILESDIR}"/${P}-queue.patch +) + src_prepare() { default - # The bundled copy includes cdefs which breaks on musl and - # this header is already available on glibc. - # bug #828806 + # The bundled copy includes cdefs which breaks on musl and this header is + # already available on glibc. See bug #828806 and + # https://github.com/any1/aml/issues/11. rm include/sys/queue.h || die } diff --git a/dev-libs/aml/aml-9999.ebuild b/dev-libs/aml/aml-9999.ebuild index abe16736f7e8..a7c7dfbf2a1a 100644 --- a/dev-libs/aml/aml-9999.ebuild +++ b/dev-libs/aml/aml-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~loong ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~x86" fi LICENSE="ISC" @@ -22,12 +22,16 @@ IUSE="examples" DEPEND="elibc_musl? ( sys-libs/queue-standalone )" +PATCHES=( + "${FILESDIR}"/${P}-queue.patch +) + src_prepare() { default - # The bundled copy includes cdefs which breaks on musl and - # this header is already available on glibc. - # bug #828806 + # The bundled copy includes cdefs which breaks on musl and this header is + # already available on glibc. See bug #828806 and + # https://github.com/any1/aml/issues/11. rm include/sys/queue.h || die } diff --git a/dev-libs/aml/files/aml-0.3.0-queue.patch b/dev-libs/aml/files/aml-0.3.0-queue.patch new file mode 100644 index 000000000000..299379a934f6 --- /dev/null +++ b/dev-libs/aml/files/aml-0.3.0-queue.patch @@ -0,0 +1,21 @@ +The bundled queue.h breaks on musl, but the standard version lacks +LIST_FOREACH_SAFE, which appears to come from FreeBSD, so patch that back +in here. See https://github.com/any1/aml/issues/11. + +diff -Naur a/src/aml.c b/src/aml.c +--- a/src/aml.c 2023-01-22 12:57:53.000000000 +0000 ++++ b/src/aml.c 2023-03-19 10:10:11.034092428 +0000 +@@ -31,6 +31,13 @@ + #include "sys/queue.h" + #include "thread-pool.h" + ++#ifndef LIST_FOREACH_SAFE ++#define LIST_FOREACH_SAFE(var, head, field, tvar) \ ++ for ((var) = LIST_FIRST((head)); \ ++ (var) && ((tvar) = LIST_NEXT((var), field), 1); \ ++ (var) = (tvar)) ++#endif ++ + #define EXPORT __attribute__((visibility("default"))) + + #define EVENT_MASK_DEFAULT AML_EVENT_READ 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..029939d94ea9 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 @@ -16,10 +16,6 @@ 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 new file mode 100644 index 000000000000..62bc5186864f --- /dev/null +++ b/dev-libs/apache-arrow/Manifest @@ -0,0 +1,6 @@ +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-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-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 diff --git a/dev-libs/apache-arrow/apache-arrow-11.0.0-r2.ebuild b/dev-libs/apache-arrow/apache-arrow-11.0.0-r2.ebuild new file mode 100644 index 000000000000..53701dd50256 --- /dev/null +++ b/dev-libs/apache-arrow/apache-arrow-11.0.0-r2.ebuild @@ -0,0 +1,119 @@ +# 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 + ) +" + +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 + json? ( dev-libs/rapidjson ) + test? ( + dev-libs/boost + dev-cpp/gflags + dev-cpp/gtest + ) +" + +REQUIRED_USE="test? ( + json + parquet? ( zstd ) + ) + ssl? ( json )" + +S="${WORKDIR}/${P}/cpp" + +PATCHES=( "${FILESDIR}/${P}-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) + ) + 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-12.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-12.0.0.ebuild new file mode 100644 index 000000000000..9091784721ce --- /dev/null +++ b/dev-libs/apache-arrow/apache-arrow-12.0.0.ebuild @@ -0,0 +1,120 @@ +# 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 + ) +" + +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 )" + +S="${WORKDIR}/${P}/cpp" + +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/files/apache-arrow-11.0.0-shared-lz4.patch b/dev-libs/apache-arrow/files/apache-arrow-11.0.0-shared-lz4.patch new file mode 100644 index 000000000000..fdb26196d0bb --- /dev/null +++ b/dev-libs/apache-arrow/files/apache-arrow-11.0.0-shared-lz4.patch @@ -0,0 +1,14 @@ +Index: cpp/cmake_modules/Findlz4Alt.cmake +=================================================================== +--- cpp.orig/cmake_modules/Findlz4Alt.cmake ++++ cpp/cmake_modules/Findlz4Alt.cmake +@@ -32,8 +32,8 @@ if(lz4_FOUND) + # Conan uses lz4::lz4 not LZ4::lz4 + if(NOT TARGET LZ4::lz4 AND TARGET lz4::lz4) + add_library(LZ4::lz4 ALIAS lz4::lz4) ++ return() + endif() +- return() + endif() + + if(MSVC_TOOLCHAIN AND NOT DEFINED LZ4_MSVC_LIB_PREFIX) diff --git a/dev-libs/apache-arrow/metadata.xml b/dev-libs/apache-arrow/metadata.xml new file mode 100644 index 000000000000..ec76842d03f6 --- /dev/null +++ b/dev-libs/apache-arrow/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <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> + <flag name="parquet">Enables read/write parquet data format</flag> + <flag name="re2">Build with support for regular expressions using the re2 library</flag> + </use> + <upstream> + <remote-id type="github">apache/arrow</remote-id> + <remote-id type="github">apache/parquet-testing</remote-id> + <remote-id type="github">apache/arrow-testing</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild index 8dd04ed40ecd..4bd0df70fdb9 100644 --- a/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild +++ b/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0/8" # soname version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="gtk-doc fonts +introspection stemmer" RDEPEND=" diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest index 3759f954dca7..55721b0e12da 100644 --- a/dev-libs/apr-util/Manifest +++ b/dev-libs/apr-util/Manifest @@ -1 +1 @@ -DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d +DIST apr-util-1.6.3.tar.bz2 432692 BLAKE2B 5eb56c45ba9d87ff3e3769439a3a9a858a1947de68b34892c729f39736fc41117a41c630c3c4cfb07b444c4ee0d5853ec5be158e8fa0b0c0ab89f0cb51cc9c6d SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe diff --git a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild b/dev-libs/apr-util/apr-util-1.6.3.ebuild index ff0412e3d5fc..a89798ba780f 100644 --- a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild +++ b/dev-libs/apr-util/apr-util-1.6.3.ebuild @@ -1,13 +1,13 @@ -# 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 # Usually apr-util has the same PV as apr, but in case of security fixes, this may change. # APR_PV="${PV}" -APR_PV="1.7.0-r6" +APR_PV="1.7.2" -inherit autotools db-use libtool multilib toolchain-funcs +inherit autotools db-use multilib toolchain-funcs DESCRIPTION="Apache Portable Runtime Utility Library" HOMEPAGE="https://apr.apache.org/" @@ -15,9 +15,8 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs" -#RESTRICT="test" RDEPEND=" >=dev-libs/apr-${APR_PV}:1= @@ -26,33 +25,32 @@ RDEPEND=" berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) - mysql? ( || ( - dev-db/mariadb-connector-c - >=dev-db/mysql-connector-c-8 - ) ) + mysql? ( + || ( + dev-db/mariadb-connector-c + >=dev-db/mysql-connector-c-8 + ) + ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) - openssl? ( - dev-libs/openssl:0= - ) + openssl? ( dev-libs/openssl:= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) " -DOCS=(CHANGES NOTICE README) +DOCS=( CHANGES NOTICE README ) PATCHES=( - "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775 - "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch - "${FILESDIR}"/${PN}-1.6.1-libtool.patch # 779487 - "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch + "${FILESDIR}"/${PN}-1.5.3-sysroot.patch # bug #385775 + "${FILESDIR}"/${PN}-1.6.1-libtool.patch # bug #779487 "${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 ) src_prepare() { @@ -65,7 +63,6 @@ src_prepare() { mv configure.{in,ac} || die eautoreconf - elibtoolize } src_configure() { @@ -93,9 +90,9 @@ src_configure() { db_version="${db_version/\./}" myconf+=( --with-dbm=db${db_version} - # We use $T for the libdir because otherwise it'd simply be the normal - # system libdir. That's pointless as the compiler will search it for - # us already. This makes cross-compiling and such easier. + # We use ${T} for the libdir because otherwise it'd simply be the normal + # system libdir. That's pointless as the compiler will search it for + # us already. This makes cross-compiling and such easier. --with-berkeley-db="$(db_includedir 2>/dev/null):${T}" ) else @@ -103,22 +100,22 @@ src_configure() { fi if use nss || use openssl ; then - myconf+=( --with-crypto ) # 518708 + # bug #518708 + myconf+=( --with-crypto ) fi econf "${myconf[@]}" + # Use the current env build settings rather than whatever apr was built with. sed -i -r \ -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \ -e "/^CC=/s:=.*:=$(tc-getCC):" \ - -e '/^(C|CPP|CXX|LD)FLAGS=/d' \ -e '/^LTFLAGS/s:--silent::' \ build/rules.mk || die } src_compile() { - emake - use doc && emake dox + emake all $(usev doc dox) } src_test() { @@ -133,6 +130,7 @@ src_install() { if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die fi + if ! use static-libs ; then find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die fi diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch b/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch deleted file mode 100644 index 92a4738e66a5..000000000000 --- a/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch +++ /dev/null @@ -1,79 +0,0 @@ -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=889170 -# needs to be submitted upstream ---- apr-util.orig/dbm/apr_dbm_gdbm.c -+++ apr-util/dbm/apr_dbm_gdbm.c -@@ -36,13 +36,22 @@ - static apr_status_t g2s(int gerr) - { - if (gerr == -1) { -- /* ### need to fix this */ -- return APR_EGENERAL; -+ return APR_OS_START_USEERR + gdbm_errno; - } - - return APR_SUCCESS; - } - -+static apr_status_t gdat2s(datum d) -+{ -+ if (d.dptr == NULL) { -+ return APR_OS_START_USEERR + gdbm_errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+ - static apr_status_t datum_cleanup(void *dptr) - { - if (dptr) -@@ -55,19 +64,15 @@ static apr_status_t set_error(apr_dbm_t - { - apr_status_t rv = APR_SUCCESS; - -- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */ -- -- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) { -+ if (dbm_said == APR_SUCCESS) { -+ dbm->errcode = GDBM_NO_ERROR; - dbm->errmsg = NULL; - } - else { -+ dbm->errcode = dbm_said; - dbm->errmsg = gdbm_strerror(gdbm_errno); -- rv = APR_EGENERAL; /* ### need something better */ - } - -- /* captured it. clear it now. */ -- gdbm_errno = GDBM_NO_ERROR; -- - return rv; - } - -@@ -144,7 +149,7 @@ static apr_status_t vt_gdbm_fetch(apr_db - - /* store the error info into DBM, and return a status code. Also, note - that *pvalue should have been cleared on error. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key, -@@ -203,7 +208,7 @@ static apr_status_t vt_gdbm_firstkey(apr - apr_pool_cleanup_null); - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) -@@ -223,7 +228,7 @@ static apr_status_t vt_gdbm_nextkey(apr_ - apr_pool_cleanup_null); - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data) diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch b/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch deleted file mode 100644 index 137e99f97637..000000000000 --- a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch +++ /dev/null @@ -1,116 +0,0 @@ -Backport of http://svn.apache.org/viewvc?rev=1872060&view=rev - ---- a/build/dbd.m4 -+++ b/build/dbd.m4 -@@ -163,10 +163,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - old_cppflags="$CPPFLAGS" - old_ldflags="$LDFLAGS" - -+ my_library="mysqlclient" -+ - AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]), - [ - if test "$withval" = "yes"; then - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config]) -+ if test "x$MYSQL_CONFIG" = "x"; then -+ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config]) -+ fi - if test "x$MYSQL_CONFIG" != 'x'; then - mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" - mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" -@@ -174,29 +179,37 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - - APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) - APR_ADDTO(LIBS, [$mysql_LIBS]) -+ -+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then -+ my_library="mariadb" -+ fi - fi - -- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <my_global.h>]) -- if test "$apu_have_mysql" = "0"; then -- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <mysql/my_global.h>]) -+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ if test "$apr_have_mysql" = "0"; then -+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) - fi -- if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then -+ if test "$apr_have_mysql" = "1"; then -+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) -+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) -+ fi -+ if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) - fi - elif test "$withval" = "no"; then - : - else - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) -+ if test "x$MYSQL_CONFIG" = "x"; then -+ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config],,[$withval/bin]) -+ fi - if test "x$MYSQL_CONFIG" != 'x'; then - mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" - mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" - mysql_LIBS="`$MYSQL_CONFIG --libs_r`" -+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then -+ my_library="mariadb" -+ fi - else - mysql_CPPFLAGS="-I$withval/include" - mysql_LDFLAGS="-L$withval/lib " -@@ -207,18 +220,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - APR_ADDTO(LIBS, [$mysql_LIBS]) - - AC_MSG_NOTICE(checking for mysql in $withval) -- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <my_global.h>]) -- -- if test "$apu_have_mysql" != "1"; then -- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <mysql/my_global.h>]) -+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ if test "$apr_have_mysql" = "0"; then -+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ fi -+ if test "$apr_have_mysql" = "1"; then -+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) -+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) - fi -- if test "$apu_have_mysql" != "0"; then -+ if test "$apu_have_mysql" = "1"; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) - fi - fi -@@ -229,7 +239,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - dnl Since we have already done the AC_CHECK_LIB tests, if we have it, - dnl we know the library is there. - if test "$apu_have_mysql" = "1"; then -- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS]) -+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS]) - fi - AC_SUBST(LDADD_dbd_mysql) - ---- a/dbd/apr_dbd_mysql.c -+++ b/dbd/apr_dbd_mysql.c -@@ -1262,7 +1262,9 @@ static apr_status_t thread_end(void *data) - - static void dbd_mysql_init(apr_pool_t *pool) - { -+#if MYSQL_VERSION_ID < 100000 - my_init(); -+#endif - mysql_thread_init(); - - /* FIXME: this is a guess; find out what it really does */ diff --git a/dev-libs/apr-util/files/apr-util-1.6.3-fix-pkgconfig-libs.patch b/dev-libs/apr-util/files/apr-util-1.6.3-fix-pkgconfig-libs.patch new file mode 100644 index 000000000000..06c8e5d2eb07 --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.6.3-fix-pkgconfig-libs.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/811765 +https://sources.debian.org/patches/apr-util/1.6.3-1/apu_config_dont_list_indep_libs.patch/ + +From: Peter Samuelson <peter@p12n.org> +Subject: Prevent recursive linking of dependent libraries by apr-util users. + +--- a/apr-util.pc.in ++++ b/apr-util.pc.in +@@ -8,6 +8,7 @@ Name: APR Utils + Description: Companion library for APR + Version: @APRUTIL_DOTTED_VERSION@ + # assume that apr-util requires libapr of same major version +-Requires: apr-@APRUTIL_MAJOR_VERSION@ +-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@ ++Requires.private: apr-@APRUTIL_MAJOR_VERSION@ ++Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ ++Libs.private: @APRUTIL_EXPORT_LIBS@ + Cflags: -I${includedir} +--- a/apu-config.in ++++ b/apu-config.in +@@ -27,7 +27,7 @@ bindir="@bindir@" + libdir="@libdir@" + includedir="${SYSROOT}@includedir@" + +-LIBS="@APRUTIL_EXPORT_LIBS@" ++LIBS= + INCLUDES="@APRUTIL_INCLUDES@" + LDFLAGS="@APRUTIL_LDFLAGS@" + LDAP_LIBS="@LDADD_ldap@" diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest index c7cbafa5c57b..32e6e7e42c5e 100644 --- a/dev-libs/apr/Manifest +++ b/dev-libs/apr/Manifest @@ -1 +1,3 @@ -DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148 +DIST apr-1.7.2.tar.bz2 890218 BLAKE2B a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15 SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e +DIST apr-1.7.3.tar.bz2 901048 BLAKE2B effd809ff2d43c5340874456c6440c94c3c1dc728964d6b65050e0e11692961ccbedba63fd02009c79fa05bb8effde7cc46d2b22c560745d49d54f0a793e4b6d SHA512 d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124 +DIST apr-1.7.4.tar.bz2 894526 BLAKE2B a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd diff --git a/dev-libs/apr/apr-1.7.2-r1.ebuild b/dev-libs/apr/apr-1.7.2-r1.ebuild new file mode 100644 index 000000000000..e1c446e9551f --- /dev/null +++ b/dev-libs/apr/apr-1.7.2-r1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools 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" + +# 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 ) +" +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) + --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 + + if use ppc || use sparc || use mips; then + # 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 + 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.0-r6.ebuild b/dev-libs/apr/apr-1.7.2.ebuild index 855fd6a0da42..2bac56d69761 100644 --- a/dev-libs/apr/apr-1.7.0-r6.ebuild +++ b/dev-libs/apr/apr-1.7.2.ebuild @@ -1,9 +1,9 @@ -# 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 autotools libtool toolchain-funcs +inherit autotools toolchain-funcs DESCRIPTION="Apache Portable Runtime Library" HOMEPAGE="https://apr.apache.org/" @@ -11,30 +11,32 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc older-kernels-compatibility selinux static-libs +urandom" +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" # See bug #815265 for libcrypt dependency -CDEPEND="virtual/libcrypt:= - elibc_glibc? ( >=sys-apps/util-linux-2.16 )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-base-policy )" -DEPEND="${CDEPEND} +DEPEND=" + virtual/libcrypt:= + elibc_glibc? ( >=sys-apps/util-linux-2.16 ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-base-policy ) +" +BDEPEND=" >=sys-devel/libtool-2.4.2 - doc? ( app-doc/doxygen )" + doc? ( app-doc/doxygen ) +" DOCS=( CHANGES NOTICE README ) PATCHES=( - "${FILESDIR}"/${PN}-1.5.0-mint.patch - "${FILESDIR}"/${PN}-1.5.0-libtool.patch - "${FILESDIR}"/${PN}-1.5.0-cross-types.patch - "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch - "${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353 - "${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545 - "${FILESDIR}"/${PN}-1.7.0-clang-16.patch #870004 - "${FILESDIR}"/${PN}-1.7.0-dev-zero.patch #830833 + "${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}"/config.layout.patch ) src_prepare() { @@ -42,12 +44,11 @@ src_prepare() { mv configure.in configure.ac || die AT_M4DIR="build" eautoreconf - elibtoolize - - eapply "${FILESDIR}/config.layout.patch" } src_configure() { + tc-export AS CC CPP + local myconf=( --enable-layout=gentoo --enable-nonportable-atomics @@ -57,19 +58,23 @@ src_configure() { --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build ) - if use older-kernels-compatibility; then + 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" \ @@ -89,36 +94,16 @@ src_configure() { if use urandom; then myconf+=( --with-devrandom=/dev/urandom ) - elif (( ${CHOST#*-hpux11.} <= 11 )); then - : # no /dev/*random on hpux11.11 and before, ${PN} detects this. else myconf+=( --with-devrandom=/dev/random ) fi - tc-is-static-only && myconf+=( --disable-dso ) - - # shl_load does not search runpath, but hpux11 supports dlopen - [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) - - if [[ ${CHOST} == *-solaris2.10 ]]; then - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in - *atomic_cas_ptr*) ;; - *) - elog "You do not have Solaris Patch ID "$( - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 - )" (Problem 4954703) installed on your host ($(hostname))," - elog "using generic atomic operations instead." - myconf+=( --disable-nonportable-atomics ) - ;; - esac - else - if use ppc || use sparc || use mips; then - # 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 - myconf+=( --disable-nonportable-atomics ) - fi + if use ppc || use sparc || use mips; then + # 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 + myconf+=( --disable-nonportable-atomics ) fi econf "${myconf[@]}" @@ -128,16 +113,13 @@ 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 - - if use doc; then - emake dox - fi + emake all $(usev doc dox) } src_test() { diff --git a/dev-libs/apr/apr-1.7.3.ebuild b/dev-libs/apr/apr-1.7.3.ebuild new file mode 100644 index 000000000000..3dc1fa16ac8a --- /dev/null +++ b/dev-libs/apr/apr-1.7.3.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools 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" + +# 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 ) +" +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) + --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 ) + myconf+=( --with-devrandom=/dev/random ) + fi + + if use ppc || use sparc || use mips; then + # 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 + 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 new file mode 100644 index 000000000000..7a36f8629dcf --- /dev/null +++ b/dev-libs/apr/apr-1.7.4.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools 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 + + if use ppc || use sparc || use mips; then + # 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 + 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/files/apr-1.5.0-cross-types.patch b/dev-libs/apr/files/apr-1.5.0-cross-types.patch deleted file mode 100644 index 266e5676817f..000000000000 --- a/dev-libs/apr/files/apr-1.5.0-cross-types.patch +++ /dev/null @@ -1,63 +0,0 @@ -use standard AC_CHECK_SIZEOF as it supports non-builtin types and -supports cross-compiling sanely - -https://issues.apache.org/bugzilla/show_bug.cgi?id=56053 - ---- a/configure.in -+++ b/configure.in -@@ -1684,7 +1684,7 @@ else - socklen_t_value="int" - fi - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8) -+AC_CHECK_SIZEOF(pid_t) - - if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then - pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1753,7 +1753,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) - APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) - APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) -+AC_CHECK_SIZEOF(ssize_t) - - AC_MSG_CHECKING([which format to use for apr_ssize_t]) - if test -n "$ssize_t_fmt"; then -@@ -1770,7 +1770,7 @@ fi - - ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) -+AC_CHECK_SIZEOF(size_t) - - AC_MSG_CHECKING([which format to use for apr_size_t]) - if test -n "$size_t_fmt"; then -@@ -1787,7 +1787,7 @@ fi - - size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) -+AC_CHECK_SIZEOF(off_t) - - if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then - # Enable LFS -@@ -1866,7 +1866,7 @@ case $host in - ;; - *) - ino_t_value=ino_t -- APR_CHECK_SIZEOF_EXTENDED(AC_INCLUDES_DEFAULT, ino_t, $ac_cv_sizeof_long) -+ AC_CHECK_SIZEOF(ino_t) - if test $ac_cv_sizeof_ino_t = 4; then - if test $ac_cv_sizeof_long = 4; then - ino_t_value="unsigned long" -@@ -1886,8 +1886,8 @@ else - bigendian=0 - fi - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> --#include <sys/uio.h>],struct iovec,0) -+AC_CHECK_SIZEOF(struct iovec,,[AC_INCLUDES_DEFAULT -+#include <sys/uio.h>]) - if test "$ac_cv_sizeof_struct_iovec" = "0"; then - have_iovec=0 - else diff --git a/dev-libs/apr/files/apr-1.5.0-mint.patch b/dev-libs/apr/files/apr-1.5.0-mint.patch deleted file mode 100644 index cfe039e962c6..000000000000 --- a/dev-libs/apr/files/apr-1.5.0-mint.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- apr-1.5.0/build/apr_hints.m4 -+++ apr-1.5.0/build/apr_hints.m4 -@@ -45,6 +45,8 @@ - case "$host" in - *mint) - APR_ADDTO(CPPFLAGS, [-DMINT -D_GNU_SOURCE]) -+ apr_cv_pthreads_cflags="none" -+ apr_cv_pthreads_lib="-lpthread" - ;; - *MPE/iX*) - APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE]) ---- apr-1.5.0/build/apr_threads.m4 -+++ apr-1.5.0/build/apr_threads.m4 -@@ -198,7 +198,7 @@ - AC_DEFUN([APR_CHECK_SIGWAIT_ONE_ARG], [ - AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[ - AC_TRY_COMPILE([ --#if defined(__NETBSD__) || defined(DARWIN) -+#if defined(__NETBSD__) || defined(DARWIN) || defined(MINT) - /* When using the unproven-pthreads package, we need to pull in this - * header to get a prototype for sigwait(). Else things will fail later - * on. XXX Should probably be fixed in the unproven-pthreads package. diff --git a/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch b/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch deleted file mode 100644 index f23d729f523e..000000000000 --- a/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch +++ /dev/null @@ -1,53 +0,0 @@ - -SECURITY: CVE-2021-35940 (cve.mitre.org) - -Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though -was addressed in 1.6.x in 1.6.3 and later via r1807976. - -The fix was merged back to 1.7.x in r1891198. - -Since this was a regression in 1.7.0, a new CVE name has been assigned -to track this, CVE-2021-35940. - -Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue. - -https://svn.apache.org/viewvc?view=revision&revision=1891198 - -Index: time/unix/time.c -=================================================================== ---- a/time/unix/time.c (revision 1891197) -+++ b/time/unix/time.c (revision 1891198) -@@ -142,6 +142,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) -Index: time/win32/time.c -=================================================================== ---- a/time/win32/time.c (revision 1891197) -+++ b/time/win32/time.c (revision 1891198) -@@ -54,6 +54,9 @@ - static const int dayoffset[12] = - {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - -+ if (tm->wMonth < 1 || tm->wMonth > 12) -+ return APR_EBADDATE; -+ - /* Note; the caller is responsible for filling in detailed tm_usec, - * tm_gmtoff and tm_isdst data when applicable. - */ -@@ -228,6 +231,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) diff --git a/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch b/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch deleted file mode 100644 index 488c3c59321d..000000000000 --- a/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5593f23e8e062da108ed585535e7281b87346ee1 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Wed, 25 Nov 2020 09:36:25 +0000 -Subject: [PATCH] build/apr_common.m4: avoid explicit inclusion of - '"confdefs.h"' - -The failure is observed on `autoconf-2.69d` (soon to be released -as `autoconf-2.70`). There `int64_t` detection fails as: - -``` -$ autoreconf && ./configure -... -checking whether int64_t and int use fmt %d... no -checking whether int64_t and long use fmt %ld... no -checking whether int64_t and long long use fmt %lld... no -configure: error: could not determine the string function for int64_t -``` - -This happens because `./configure` always stumbles on warning: - -``` -configure:3350: gcc -c -g -O2 -Werror conftest.c >&5 -In file included from conftest.c:31: -confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror] - 22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 - | -``` - -It's triggered by double inclusion of `"confdefs.h"` contents: -explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly -via `AC_LANG_SOURCE` use. - -To fix it and avoid having to define `main()` declaration the change -uses `AC_LANG_PROGRAM` instead. - -Tested on both `autoconf-2.69` and `autoconf-2.69d`. - -Bug: https://bugs.gentoo.org/738156 -Bug: https://bugs.gentoo.org/750353 -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - build/apr_common.m4 | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index f4e2dfd0a7..6f5782e674 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -504,13 +504,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -- [[$1]] -- [int main(int argc, const char *const *argv) {] -+ [AC_LANG_PROGRAM( -+ [[$1]], - [[$2]] -- [ return 0; }] - )], [CFLAGS=$apr_save_CFLAGS - $3], [CFLAGS=$apr_save_CFLAGS - $4]) diff --git a/dev-libs/apr/files/apr-1.7.0-clang-16.patch b/dev-libs/apr/files/apr-1.7.0-clang-16.patch deleted file mode 100644 index 2244b07a14ff..000000000000 --- a/dev-libs/apr/files/apr-1.7.0-clang-16.patch +++ /dev/null @@ -1,174 +0,0 @@ -https://bugs.gentoo.org/870004 - -Fixed upstream, hopefully (it's hard to keep track of 1.7.x branch churn): -- https://bz.apache.org/bugzilla/show_bug.cgi?id=64753 -- https://bz.apache.org/bugzilla/show_bug.cgi?id=65087 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -467,6 +467,7 @@ changequote([, ])dnl - AC_MSG_CHECKING(size of $2) - AC_CACHE_VAL(AC_CV_NAME, - [AC_TRY_RUN([#include <stdio.h> -+#include <stdlib.h> - $1 - #ifdef WIN32 - #define binmode "b" -@@ -531,7 +532,8 @@ AC_TRY_RUN([ - #include <errno.h> - #include <string.h> - #include <stdio.h> --main() -+#include <stdlib.h> -+int main() - { - char buf[1024]; - if (strerror_r(ERANGE, buf, sizeof buf) < 1) { ---- a/build/apr_network.m4 -+++ b/build/apr_network.m4 -@@ -63,6 +63,10 @@ AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO], [ - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif -+#include <stdlib.h> -+ -+#include <netinet/in.h> -+#include <arpa/inet.h> - - int main(void) { - struct addrinfo hints, *ai; -@@ -136,6 +140,11 @@ dnl - AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO], [ - AC_CACHE_CHECK(for working getnameinfo, ac_cv_working_getnameinfo,[ - AC_TRY_RUN( [ -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <stdlib.h> -+ - #ifdef HAVE_NETDB_H - #include <netdb.h> - #endif -@@ -195,6 +204,8 @@ AC_DEFUN([APR_CHECK_NEGATIVE_EAI], [ - #include <netdb.h> - #endif - -+#include <stdlib.h> -+ - int main(void) { - if (EAI_ADDRFAMILY < 0) { - exit(0); -@@ -388,9 +399,14 @@ AC_DEFUN([APR_CHECK_TCP_NODELAY_INHERITED], [ - AC_CACHE_CHECK(if TCP_NODELAY setting is inherited from listening sockets, ac_cv_tcp_nodelay_inherited,[ - AC_TRY_RUN( [ - #include <stdio.h> -+#include <stdlib.h> -+ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> --#endif -+#end -+#ifdef HAVE_STRING_H -+#include <string.h> -+#endifif - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif -@@ -734,6 +750,9 @@ AC_TRY_COMPILE([ - #ifdef HAVE_ARPA_INET_H - #include <arpa/inet.h> - #endif -+ -+#include <sys/socket.h> -+#include <netinet/in.h> - ],[ - inet_addr("127.0.0.1"); - ],[ -@@ -754,6 +773,9 @@ fi - AC_DEFUN([APR_CHECK_INET_NETWORK], [ - AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[ - AC_TRY_COMPILE([ -+#include <sys/socket.h> -+#include <netinet/in.h> -+ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif ---- a/configure.in -+++ b/configure.in -@@ -1440,8 +1440,6 @@ AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ]) - AC_DECL_SYS_SIGLIST - - AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ]) --APR_CHECK_INET_ADDR --APR_CHECK_INET_NETWORK - AC_SUBST(apr_inaddr_none) - AC_CHECK_FUNC(_getch) - AC_CHECK_FUNCS(strerror_r, [ strerror_r="1" ], [ strerror_r="0" ]) -@@ -1547,6 +1545,9 @@ APR_FLAG_HEADERS( - sys/un.h \ - sys/wait.h) - -+APR_CHECK_INET_ADDR -+APR_CHECK_INET_NETWORK -+ - # IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from - # being included by itself. Check for <netinet/tcp.h> manually, - # including another header file first. -@@ -2208,7 +2209,8 @@ AC_TRY_RUN([ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/resource.h> --main() -+#include <stdlib.h> -+int main() - { - struct rlimit limit; - limit.rlim_cur = 0; -@@ -2247,7 +2249,7 @@ AC_TRY_RUN([ - #ifndef SEM_FAILED - #define SEM_FAILED (-1) - #endif --main() -+int main() - { - sem_t *psem; - const char *sem_name = "/apr_autoconf"; -@@ -2307,6 +2309,7 @@ if test "$threads" = "1"; then - AC_TRY_RUN([ - #include <sys/types.h> - #include <pthread.h> -+#include <stdlib.h> - int main() - { - pthread_mutex_t mutex; -@@ -2435,6 +2438,8 @@ int fd; - struct flock proc_mutex_lock_it = {0}; - const char *fname = "conftest.fcntl"; - -+int lockit(); -+ - int main() - { - int rc, status;; ---- a/poll/os2/pollset.c -+++ b/poll/os2/pollset.c -@@ -308,7 +308,7 @@ APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset) - - - --APR_DECLARE(const char *) apr_poll_method_defname() -+APR_DECLARE(const char *) apr_poll_method_defname(void) - { - return "select"; - } ---- a/poll/unix/pollset.c -+++ b/poll/unix/pollset.c -@@ -188,7 +188,7 @@ APR_DECLARE(const char *) apr_pollset_method_name(apr_pollset_t *pollset) - return pollset->provider->name; - } - --APR_DECLARE(const char *) apr_poll_method_defname() -+APR_DECLARE(const char *) apr_poll_method_defname(void) - { - const apr_pollset_provider_t *provider = NULL; - diff --git a/dev-libs/apr/files/apr-1.7.0-dev-zero.patch b/dev-libs/apr/files/apr-1.7.0-dev-zero.patch deleted file mode 100644 index be6433dd46bc..000000000000 --- a/dev-libs/apr/files/apr-1.7.0-dev-zero.patch +++ /dev/null @@ -1,34 +0,0 @@ -APR (ab)uses AC_TRY_RUN to determine if: - -* We have /dev/zero -* We can mmap /dev/zero - -The APR ebuild sets ac_cv_file__dev_zero=yes when cross compiling -to fill in an answer for the first question, but the configure script -immediately defeats that when answering the second. - -AC_TRY_FUN takes four arguments: the test, and what happens on success, -failure, and cross-compiling. The APR script uses this as a "gate" to -clear ac_cv_file__dev_zero when /dev/zero exists but it turns out not -to be useable. They take a pessimistic approach: if you can't "prove" -it is mmap-able, clear the flag. - -This patch changes that to leave the flag alone while cross compiling; -just assume /dev/zero is mmap-able. It relies on ac_cv_file__dev_zero -to be correctly set for the target. The fourth parameter is changed to -[:] and not [] because [] engages autoconf's default cross-compiling -behavior, which raises an error. - -Signed-off-by: Alexandra Parker <alex.iris.parker@gmail.com> - ---- a/configure.in 2022-01-09 00:31:05.552582255 -0800 -+++ b/configure.in 2022-01-09 00:31:19.824582533 -0800 -@@ -1203,7 +1203,7 @@ - return 3; - } - return 0; -- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) -+ }], [], [ac_cv_file__dev_zero=no], [:]) - - AC_MSG_RESULT($ac_cv_file__dev_zero) - fi diff --git a/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch b/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch new file mode 100644 index 000000000000..49d3fd3f1638 --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch @@ -0,0 +1,23 @@ +https://src.fedoraproject.org/rpms/apr/raw/rawhide/f/apr-1.7.2-autoconf.patch + +Similar to https://github.com/apache/apr/commit/a15958a37a06f71c42c690278f9c958b93b7ee20. +--- a/build/apr_common.m4 ++++ b/build/apr_common.m4 +@@ -468,15 +468,8 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], + fi + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( +- [ +-#ifndef PACKAGE_NAME +-#include "confdefs.h" +-#endif +- ] +- [[$1]] +- [int main(int argc, const char *const *argv) {] ++ [[$1]], + [[$2]] +- [ return 0; }] + )], [CFLAGS=$apr_save_CFLAGS + $3], [CFLAGS=$apr_save_CFLAGS + $4]) + diff --git a/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch b/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch new file mode 100644 index 000000000000..9b4935fe7f0a --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch @@ -0,0 +1,35 @@ +Don't pollute Libs with internal bits like libcrypt. + +https://bugs.gentoo.org/811765 +https://sources.debian.org/patches/apr/1.7.2-2/fix-apr.pc.patch/ +https://sources.debian.org/patches/apr/1.7.2-2/omit_extra_libs.patch/ + +From: <tfheen@debian.org> +Subject: No description. + +--- a/apr.pc.in ++++ b/apr.pc.in +@@ -7,5 +7,6 @@ + Name: APR + Description: The Apache Portable Runtime library + Version: @APR_DOTTED_VERSION@ +-Libs: -L${libdir} -l@APR_LIBNAME@ @EXTRA_LIBS@ +-Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir} ++Libs: -L${libdir} -l@APR_LIBNAME@ ++Libs.private: @EXTRA_LIBS@ ++Cflags: @EXTRA_CPPFLAGS@ -I${includedir} + +From: Stefan Fritsch <sf@debian.org> +Subject: #463399 + +--- a/apr-config.in ++++ b/apr-config.in +@@ -36,7 +36,7 @@ SHELL="@SHELL@" + CPPFLAGS="@EXTRA_CPPFLAGS@" + CFLAGS="@EXTRA_CFLAGS@" + LDFLAGS="@EXTRA_LDFLAGS@" +-LIBS="@EXTRA_LIBS@" ++LIBS="" + EXTRA_INCLUDES="@EXTRA_INCLUDES@" + SHLIBPATH_VAR="@shlibpath_var@" + APR_SOURCE_DIR="@apr_srcdir@" diff --git a/dev-libs/apr/files/apr-1.5.0-libtool.patch b/dev-libs/apr/files/apr-1.7.2-libtool.patch index 5368a2689bdf..121e4374f9fc 100644 --- a/dev-libs/apr/files/apr-1.5.0-libtool.patch +++ b/dev-libs/apr/files/apr-1.7.2-libtool.patch @@ -1,10 +1,9 @@ generate a local copy of libtool for use in compiling https://bugs.gentoo.org/374355 - --- a/configure.in +++ b/configure.in -@@ -260,9 +260,7 @@ case $host in +@@ -268,9 +268,7 @@ case $host in fi else dnl libtoolize requires that the following not be indented @@ -13,5 +12,5 @@ https://bugs.gentoo.org/374355 -AC_PROG_LIBTOOL +LT_INIT(win32-dll) # get libtool's setting of shlibpath_var - eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool` if test "x$shlibpath_var" = "x"; then + eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool` diff --git a/dev-libs/apr/files/apr-1.7.2-respect-flags.patch b/dev-libs/apr/files/apr-1.7.2-respect-flags.patch new file mode 100644 index 000000000000..f075fc0514d2 --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.2-respect-flags.patch @@ -0,0 +1,22 @@ +https://sources.debian.org/patches/apr/1.7.2-2/dont_override_external_buildflags/ + +# Don't force apr-using projects to use the compile flags used during +# apr's compilation. +--- a/build/apr_rules.mk.in ++++ b/build/apr_rules.mk.in +@@ -42,10 +42,10 @@ LIBTOOL=@LIBTOOL@ + # compilation and linking flags that are supposed to be set only by the user. + # configure adds to them for tests, but we restore them at the end. + # +-CFLAGS=@CFLAGS@ +-CPPFLAGS=@CPPFLAGS@ +-LDFLAGS=@LDFLAGS@ +-LIBS=@LIBS@ ++CFLAGS?=@CFLAGS@ ++CPPFLAGS?=@CPPFLAGS@ ++LDFLAGS?=@LDFLAGS@ ++LIBS?=@LIBS@ + DEFS=@DEFS@ + + # anything added to the standard flags by configure is moved to EXTRA_* + diff --git a/dev-libs/apr/files/apr-1.5.0-sysroot.patch b/dev-libs/apr/files/apr-1.7.2-sysroot.patch index 54c9d649ef07..3b666ebfd833 100644 --- a/dev-libs/apr/files/apr-1.5.0-sysroot.patch +++ b/dev-libs/apr/files/apr-1.7.2-sysroot.patch @@ -4,10 +4,10 @@ utilize $SYSROOT to find the right includedir tree drop the -L/-R paths since we know our libdir is the standard path which the compiler already knows how to locate - --- a/apr-config.in +++ b/apr-config.in -@@ -28,7 +28,7 @@ libdir="@libdir@" +@@ -27,8 +27,8 @@ bindir="@bindir@" + libdir="@libdir@" datarootdir="@datadir@" datadir="@datadir@" -installbuilddir="@installbuilddir@" @@ -17,21 +17,21 @@ the compiler already knows how to locate CC="@CC@" CPP="@CPP@" -@@ -183,7 +183,7 @@ while test $# -gt 0; do +@@ -199,7 +199,7 @@ while test $# -gt 0; do --link-ld) if test "$location" = "installed"; then ### avoid using -L if libdir is a "standard" location like /usr/lib - flags="$flags -L$libdir -l${APR_LIBNAME}" + flags="$flags -l${APR_LIBNAME}" + elif test "$location" = "crosscompile"; then + flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" else - ### this surely can't work since the library is in .libs? - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" -@@ -200,7 +200,7 @@ while test $# -gt 0; do +@@ -218,7 +218,7 @@ while test $# -gt 0; do ### avoid using -L if libdir is a "standard" location like /usr/lib # Since the user is specifying they are linking with libtool, we # *know* that -R will be recognized by libtool. - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" + flags="$flags -l${APR_LIBNAME}" + elif test "$location" = "crosscompile"; then + flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" else - flags="$flags $LA_FILE" - fi diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml index 94b201450b4b..b8d4a84e26af 100644 --- a/dev-libs/apr/metadata.xml +++ b/dev-libs/apr/metadata.xml @@ -6,7 +6,7 @@ <name>Apache project</name> </maintainer> <use> - <flag name="older-kernels-compatibility">Enable binary compatibility with older kernels</flag> + <flag name="old-kernel">Enable compatibility with older kernels</flag> <flag name="urandom">Use /dev/urandom instead of /dev/random</flag> </use> <upstream> diff --git a/dev-libs/argtable/argtable-2.13-r4.ebuild b/dev-libs/argtable/argtable-2.13-r4.ebuild new file mode 100644 index 000000000000..f5b108d4161e --- /dev/null +++ b/dev-libs/argtable/argtable-2.13-r4.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_rs 1 '-')" +MY_P=${PN}${MY_PV} + +DESCRIPTION="An ANSI C library for parsing GNU-style command-line options with minimal fuss" +HOMEPAGE="https://argtable.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc debug examples static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-2.13-Fix-implicit-function-declaration.patch + "${FILESDIR}"/${PN}-2.13-Fix-undeclared-library-function.patch +) + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable static-libs static) +} + +src_install() { + default + + rm -rf "${ED}"/usr/share/doc/${PF}/ + + if use doc ; then + cd "${S}"/doc || die + dodoc *.pdf *.ps + docinto html + dodoc *.html *.gif + fi + + if use examples ; then + cd "${S}"/example || die + docinto examples + dodoc Makefile *.[ch] README.txt + fi + + find "${ED}" -name "*.la" -delete || die "failed to delete .la files" +} diff --git a/dev-libs/argtable/files/argtable-2.13-Fix-undeclared-library-function.patch b/dev-libs/argtable/files/argtable-2.13-Fix-undeclared-library-function.patch new file mode 100644 index 000000000000..7f42d43727a5 --- /dev/null +++ b/dev-libs/argtable/files/argtable-2.13-Fix-undeclared-library-function.patch @@ -0,0 +1,28 @@ +From 519609d844f1e5bbf37407de8e43fa2d2be03262 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sun, 7 May 2023 00:03:40 +0530 +Subject: [PATCH] Fix undeclared library function strcmp + +Bug: https://bugs.gentoo.org/885609 +--- a/tests/fntests.c ++++ b/tests/fntests.c +@@ -1,5 +1,6 @@ + #include "../src/argtable2.h" + #include <assert.h> ++#include <string.h> + + /* for memory leak debugging */ + #ifdef DMALLOC +--- a/tests/test_file.c ++++ b/tests/test_file.c +@@ -21,6 +21,7 @@ USA. + + #include "../src/argtable2.h" + #include <stdlib.h> ++#include <string.h> + + /* for memory leak debugging */ + #ifdef DMALLOC +-- +2.40.1 + diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild index 696e7388b2da..52b664460cb5 100644 --- a/dev-libs/atf/atf-0.21-r2.ebuild +++ b/dev-libs/atf/atf-0.21-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz" LICENSE="BSD BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" BDEPEND="virtual/pkgconfig" diff --git a/dev-libs/atk/atk-2.38.0.ebuild b/dev-libs/atk/atk-2.38.0.ebuild index 7b1b4a734e40..1670997bdf63 100644 --- a/dev-libs/atk/atk-2.38.0.ebuild +++ b/dev-libs/atk/atk-2.38.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +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="gtk-doc +introspection" RDEPEND=" diff --git a/dev-libs/avro-c/avro-c-1.9.1-r1.ebuild b/dev-libs/avro-c/avro-c-1.9.1-r2.ebuild index 3978e6b7b701..ca9fa39e45d4 100644 --- a/dev-libs/avro-c/avro-c-1.9.1-r1.ebuild +++ b/dev-libs/avro-c/avro-c-1.9.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,10 +13,10 @@ SLOT="0" KEYWORDS="amd64" DEPEND=" - app-arch/snappy + app-arch/snappy:= >=dev-libs/jansson-2.3:= sys-libs/zlib" - RDEPEND="${DEPEND}" +RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-fix-libdir.patch" diff --git a/dev-libs/ayatana-ido/Manifest b/dev-libs/ayatana-ido/Manifest index e738118b3beb..47a7e1f4a636 100644 --- a/dev-libs/ayatana-ido/Manifest +++ b/dev-libs/ayatana-ido/Manifest @@ -1 +1,2 @@ DIST ayatana-ido-0.9.2.tar.gz 122286 BLAKE2B f6498591d72fa6deb5d9c8d87ddad399e41b3701719e45fe82dc8d5bd6ede30bb754561fdeaa938713692a90b8c48657ea2cb472c762acab6c3f36c73907b92e SHA512 efc5825d32d707b02397692c347f99f3bca13da2cd653b6ce87882643c85c2698bdac6168e89a01ed98d5ee58c88a820d89dad7b88a5aee235b450c40969d0a7 +DIST ayatana-ido-0.9.3.tar.gz 122912 BLAKE2B 80c07c6f90b7e2b6d68c2629990918f091abdc85616cbf472dbcc1bbea87dabb9649d8da4d676f1acbc65c34e5a5b53143449759a0d65661352898199c1ea592 SHA512 61c9fe35be9dceabba3d61add0fa51cf0447572dbedf48f710b79cf9c4fed2a049f6d2c0069ae8499aa41f008e736e257da47c6b07fd4e20778689c9ab6853d4 diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild new file mode 100644 index 000000000000..1b4a2cfbb68e --- /dev/null +++ b/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +VALA_USE_DEPEND="vapigen" + +inherit cmake vala virtualx + +DESCRIPTION="Ayatana Application Indicators (Shared Library)" +HOMEPAGE="https://github.com/AyatanaIndicators/ayatana-ido" +SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1 LGPL-3 GPL-3" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" + +RDEPEND=" + >=dev-libs/glib-2.58:2 + >=x11-libs/gtk+-3.24:3[introspection] +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(vala_depend) + test? ( dev-cpp/gtest ) +" + +src_prepare() { + cmake_src_prepare + vala_setup +} + +src_configure() { + local mycmakeargs+=( + -DVALA_COMPILER="${VALAC}" + -DVAPI_GEN="${VAPIGEN}" + -DENABLE_TESTS="$(usex test)" + ) + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest index 3c83a27aca4a..51ec77857437 100644 --- a/dev-libs/bemenu/Manifest +++ b/dev-libs/bemenu/Manifest @@ -1 +1,3 @@ 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 diff --git a/dev-libs/bemenu/bemenu-0.6.10.ebuild b/dev-libs/bemenu/bemenu-0.6.10-r1.ebuild index 26c2c2f1a7a4..ef3592428ff4 100644 --- a/dev-libs/bemenu/bemenu-0.6.10.ebuild +++ b/dev-libs/bemenu/bemenu-0.6.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,11 +22,10 @@ IUSE="doc ncurses wayland X" # Require at least one backend be built REQUIRED_USE="|| ( ncurses wayland X )" -DEPEND=" +RDEPEND=" ncurses? ( sys-libs/ncurses:= ) wayland? ( dev-libs/wayland - dev-libs/wayland-protocols x11-libs/cairo x11-libs/pango x11-libs/libxcb @@ -40,7 +39,12 @@ DEPEND=" x11-libs/libXinerama ) " -RDEPEND="${DEPEND}" +DEPEND=" + ${RDEPEND} + wayland? ( + dev-libs/wayland-protocols + ) +" BDEPEND="doc? ( app-doc/doxygen )" src_compile() { diff --git a/dev-libs/bemenu/bemenu-0.6.14.ebuild b/dev-libs/bemenu/bemenu-0.6.14.ebuild new file mode 100644 index 000000000000..74a5e8c07a56 --- /dev/null +++ b/dev-libs/bemenu/bemenu-0.6.14.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/pango + x11-libs/libxcb + ) + X? ( + x11-libs/libxcb + x11-libs/libXext + x11-libs/libX11 + x11-libs/cairo[X] + x11-libs/pango[X] + x11-libs/libXinerama + ) +" +DEPEND=" + ${RDEPEND} + wayland? ( + dev-libs/wayland-protocols + ) +" +BDEPEND=" + app-text/scdoc + doc? ( app-doc/doxygen ) +" + +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) +} + +src_install() { + emake install PREFIX="${D}"/usr libdir=/$(get_libdir) +} diff --git a/dev-libs/bemenu/bemenu-0.6.15.ebuild b/dev-libs/bemenu/bemenu-0.6.15.ebuild new file mode 100644 index 000000000000..74a5e8c07a56 --- /dev/null +++ b/dev-libs/bemenu/bemenu-0.6.15.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/pango + x11-libs/libxcb + ) + X? ( + x11-libs/libxcb + x11-libs/libXext + x11-libs/libX11 + x11-libs/cairo[X] + x11-libs/pango[X] + x11-libs/libXinerama + ) +" +DEPEND=" + ${RDEPEND} + wayland? ( + dev-libs/wayland-protocols + ) +" +BDEPEND=" + app-text/scdoc + doc? ( app-doc/doxygen ) +" + +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) +} + +src_install() { + emake install PREFIX="${D}"/usr libdir=/$(get_libdir) +} diff --git a/dev-libs/bemenu/bemenu-9999.ebuild b/dev-libs/bemenu/bemenu-9999.ebuild index bd5b9bc60d55..74a5e8c07a56 100644 --- a/dev-libs/bemenu/bemenu-9999.ebuild +++ b/dev-libs/bemenu/bemenu-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,11 +22,10 @@ IUSE="doc ncurses wayland X" # Require at least one backend be built REQUIRED_USE="|| ( ncurses wayland X )" -DEPEND=" +RDEPEND=" ncurses? ( sys-libs/ncurses:= ) wayland? ( dev-libs/wayland - dev-libs/wayland-protocols x11-libs/cairo x11-libs/pango x11-libs/libxcb @@ -40,8 +39,16 @@ DEPEND=" x11-libs/libXinerama ) " -RDEPEND="${DEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +DEPEND=" + ${RDEPEND} + wayland? ( + dev-libs/wayland-protocols + ) +" +BDEPEND=" + app-text/scdoc + doc? ( app-doc/doxygen ) +" src_compile() { tc-export CC diff --git a/dev-libs/bemenu/metadata.xml b/dev-libs/bemenu/metadata.xml index 5c76f7a3fc67..e96918bf65fc 100644 --- a/dev-libs/bemenu/metadata.xml +++ b/dev-libs/bemenu/metadata.xml @@ -5,4 +5,7 @@ <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> + <upstream> + <remote-id type="github">Cloudef/bemenu</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/bitset/metadata.xml b/dev-libs/bitset/metadata.xml index 8f947cff4a17..80c5ed31fb8e 100644 --- a/dev-libs/bitset/metadata.xml +++ b/dev-libs/bitset/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>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="tcmalloc">Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations</flag> </use> diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest index 9242479e58a2..51568a81cabe 100644 --- a/dev-libs/boehm-gc/Manifest +++ b/dev-libs/boehm-gc/Manifest @@ -1,6 +1,4 @@ -DIST boehm-gc-8.2.0-fix-headers-install.patch.xz 55320 BLAKE2B 86f6a27c49c1c36a89e836ef2adf17e6563256ad0700e05235461b9df562029781894d1b4b76ed4fb44faf9c014e7674b909cd8a097d6d3c29cb50be55b83856 SHA512 cbb963b5f4286846ae4548216677cb34042bd8757f6792d1838663b07699837c25a727740d6d9461b582c5428ebe8e0bc670134be1d68cdc61d055f8624a76bc -DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e DIST gc-8.0.6.tar.gz 1168660 BLAKE2B c23cb10db54db0e8b16c429e039791086dfec4216ad65fabf072bc0f05df66364d019fccf945bffc32ce12868edfbaf6d9482acb2949d1e233bd89925ab55ebd SHA512 2ea25003d585118e3ac0e12be9240e8195db511c6e94949f20453dc3cb771380bd5b956c04243b2a8ce31508587aa32de4f0f10a813577e6dbe8367688b7614e DIST gc-8.0.8.tar.gz 1173619 BLAKE2B 5caa3839390f0a727d7b6fafc13094507326f42c57766ef3f80fb59d64ebbe00e780990735bdefcf26d160a1ae8d44c0d9658310314877b11a91e064a875483a SHA512 c09da03883170b91e7d4904484266948472018a42092f7df42798507666d693327895ef8348f7cb0007f7e4948fbd0476e4021f5a203838157ce46ef3a401f7b -DIST gc-8.2.0.tar.gz 1183225 BLAKE2B 382c28041b8cff9df794db48727c0bb478ed9222b15bcf11eda7132b1776970774576b63823e62a87c6563a06359a3d0572effea1ca63fb4f6fdadf1ea350cbe SHA512 ff781360bca667f1f95fbfed073e9035f63134cac1bda4f7e4217664a3713c2846f750a3ce92732972c0435c69355b051f6e8eb6f2698b0d48d9107ff960bacf DIST gc-8.2.2.tar.gz 1200115 BLAKE2B 9f0306f24189687f0e9e58cd942d67e94d009bd4c9a88556edaae756f902ce71f7eed2ee66a9a9b2e8e40c54653796f494104b395828282b83ee6a89a5542378 SHA512 4a7b26789ce22ab72bfaadf3029362c5fe26737df1e856e43db7d9b24ee8acf625e35d596bb3f698f91d6a5ddfb6c45a952a1dbd18d47359569696a544c9c248 +DIST gc-8.2.4.tar.gz 1210929 BLAKE2B 48f058b3f6f9f708d4335a7a0b077aab4ea5df32be73038bb8c20c12483d7ec8798b16db85afed5aa270f0f818de08abf9407036f662c757f361a929f99d951f SHA512 27d014378000f25fb2f5598904be85604822d5ed4553f8b3d1c279122300d3958b4432ec08f951cfd842d92121ea8a030dda34bf2475ec53d4fded551fdd3a98 diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild deleted file mode 100644 index 3d27a52ef739..000000000000 --- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit multilib-minimal libtool - -MY_P="gc-${PV}" - -DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector" -HOMEPAGE="https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/" -SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="boehm-gc" -# SONAME: libgc.so.1 libgccpp.so.1 -# We've been using subslot 0 for these instead of "1.1". -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="cxx +large static-libs +threads" - -RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - elibtoolize #594754 -} - -multilib_src_configure() { - local config=( - --disable-docs - --with-libatomic-ops - $(use_enable cxx cplusplus) - $(use_enable static-libs static) - $(use threads || echo --disable-threads) - $(use_enable large large-config) - ) - - ECONF_SOURCE=${S} econf "${config[@]}" -} - -multilib_src_install_all() { - local HTML_DOCS=( doc/*.md ) - einstalldocs - dodoc doc/README{.environment,.linux,.macros} - - # package provides .pc files - find "${ED}" -name '*.la' -delete || die - - newman doc/gc.man GC_malloc.1 -} diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild index b06d52f90cb3..4cc7f559e4bf 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild @@ -16,7 +16,7 @@ LICENSE="boehm-gc" # SONAME: libgc.so.1 libgccpp.so.1 # We've been using subslot 0 for these instead of "1.1". SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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/boehm-gc/boehm-gc-8.0.8.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.8.ebuild index b26dde827401..479709474e41 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.0.8.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.0.8.ebuild @@ -15,7 +15,7 @@ LICENSE="boehm-gc" # SONAME: libgc.so.1 libgccpp.so.1 # We've been using subslot 0 for these instead of "1.1". SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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/boehm-gc/boehm-gc-8.2.0.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.0.ebuild deleted file mode 100644 index 370b81c087bd..000000000000 --- a/dev-libs/boehm-gc/boehm-gc-8.2.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal libtool - -MY_P="gc-${PV}" - -DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector" -HOMEPAGE="https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/" -SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz - https://dev.gentoo.org/~xen0n/distfiles/${P}-fix-headers-install.patch.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE="boehm-gc" -# SONAME: libgc.so.1 libgccpp.so.1 -# We've been using subslot 0 for these instead of "1.1". -SLOT="0" -# Upstream marked this version as "Pre-release" -KEYWORDS="~loong" -IUSE="cxx +large static-libs +threads" - -RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}/${P}-fix-headers-install.patch" -) - -src_prepare() { - default - elibtoolize #594754 -} - -multilib_src_configure() { - local config=( - --disable-docs - --with-libatomic-ops - $(use_enable cxx cplusplus) - $(use_enable static-libs static) - $(use threads || echo --disable-threads) - $(use_enable large large-config) - ) - - ECONF_SOURCE=${S} econf "${config[@]}" -} - -multilib_src_install_all() { - local HTML_DOCS=( doc/*.md ) - einstalldocs - dodoc doc/README{.environment,.linux,.macros} - - # package provides .pc files - find "${ED}" -name '*.la' -delete || die - - newman doc/gc.man GC_malloc.1 -} diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.2-r1.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.2-r1.ebuild index ceebdea9178f..c4048ab70e90 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.2.2-r1.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.2.2-r1.ebuild @@ -18,7 +18,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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="cxx +large static-libs +threads" RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.2.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild index 0d463fd97be6..38f972105da2 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.2.2.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.2.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=8 @@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="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 c81f47bf5be4..4c89701f991c 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1,2 +1,2 @@ -DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f DIST boost_1_81_0.tar.bz2 118797750 BLAKE2B ae57247fb80ee5a952881a99bdbe9a1d5622690879ef59053716647dc1121e70fdd322251837387b43357f1cd63c6d1ba285cf35c0c40e4f5ee28a929d7eacf7 SHA512 a04201e73da59f68fa02761b333c864a96ebaf268247b6b10cb19ed3d70ee9ad3da4c53123f2a7a4a9b9e1408793b51e1adbcc6fd09f60fecef3ca9522bb6b36 +DIST boost_1_82_0.tar.bz2 121325129 BLAKE2B 16ee164ce7114d8134c861b3652c842750cec63ab0e79e4386d8cb9c56f7a454f9a9cfa75f25d9132a8d8d9e6f39d32a8e7535f83f52f355bbc40ef530163fa5 SHA512 6fddc452ca67f99f5c181e21c73d96feb7346e10886477c91b4abc2cdf447750599e0d42f935ef591222200ef6c033de078a7ad2bb577c81fa56a249b17420cb diff --git a/dev-libs/boost/boost-1.81.0-r1.ebuild b/dev-libs/boost/boost-1.81.0-r1.ebuild index a2dedb812859..4df537727e02 100644 --- a/dev-libs/boost/boost-1.81.0-r1.ebuild +++ b/dev-libs/boost/boost-1.81.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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +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" 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.80.0-r1.ebuild b/dev-libs/boost/boost-1.82.0-r1.ebuild index 89992f545238..f574a4282ee3 100644 --- a/dev-libs/boost/boost-1.80.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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +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 @@ -27,7 +27,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}] ) @@ -43,17 +42,16 @@ DEPEND="${RDEPEND}" BDEPEND=">=dev-util/b2-4.9.2" PATCHES=( - "${FILESDIR}"/${PN}-1.80.0-disable_icu_rpath.patch + "${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.80.0-fix-mips1-transition.patch + "${FILESDIR}"/${PN}-1.81.0-phoenix-multiple-definitions.patch + # (upstreamed) - "${FILESDIR}"/${PN}-1.80.0-unordered-fix.patch - "${FILESDIR}"/${PN}-1.80.0-unary-function.patch - "${FILESDIR}"/${PN}-1.80.0-python3.11.patch - "${FILESDIR}"/${PN}-1.80.0-unordered-ftm-malloc.patch + "${FILESDIR}"/${PN}-1.82.0-context-arm64.patch ) python_bindings_needed() { @@ -74,20 +72,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__ @@ -196,6 +189,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() { @@ -242,16 +245,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/files/boost-1.80.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch deleted file mode 100644 index 1f4ec29fcf00..000000000000 --- a/dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/libs/locale/build/Jamfile.v2 -+++ b/libs/locale/build/Jamfile.v2 -@@ -82,8 +82,8 @@ ICU_LINK ?= [ modules.peek : ICU_LINK_LOCALE ] ; - - if $(ICU_LINK) - { -- ICU_OPTS = <include>$(icu-path)/include <linkflags>$(ICU_LINK) <dll-path>$(icu-path)/bin <runtime-link>shared ; -- ICU64_OPTS = <include>$(icu-path)/include <linkflags>$(ICU_LINK) <dll-path>$(icu-path)/bin64 <runtime-link>shared ; -+ ICU_OPTS = <include>$(icu_path)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; -+ ICU64_OPTS = <include>$(icu_path)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; - } else - { - searched-lib icuuc : : <name>icuuc diff --git a/dev-libs/boost/files/boost-1.80.0-python3.11.patch b/dev-libs/boost/files/boost-1.80.0-python3.11.patch deleted file mode 100644 index cdbc36ca953f..000000000000 --- a/dev-libs/boost/files/boost-1.80.0-python3.11.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/boostorg/python/commit/a218babc8daee904a83f550fb66e5cb3f1cb3013 -https://github.com/boostorg/python/pull/385 - -From a218babc8daee904a83f550fb66e5cb3f1cb3013 Mon Sep 17 00:00:00 2001 -From: Victor Stinner <vstinner@python.org> -Date: Mon, 25 Apr 2022 10:51:46 +0200 -Subject: [PATCH] Fix enum_type_object type on Python 3.11 - -The enum_type_object type inherits from PyLong_Type which is not tracked -by the GC. Instances doesn't have to be tracked by the GC: remove the -Py_TPFLAGS_HAVE_GC flag. - -The Python C API documentation says: - - "To create a container type, the tp_flags field of the type object - must include the Py_TPFLAGS_HAVE_GC and provide an implementation of - the tp_traverse handler." - -https://docs.python.org/dev/c-api/gcsupport.html - -The new exception was introduced in Python 3.11 by: -https://github.com/python/cpython/issues/88429 ---- a/libs/python/src/object/enum.cpp -+++ b/libs/python/src/object/enum.cpp -@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = { - #if PY_VERSION_HEX < 0x03000000 - | Py_TPFLAGS_CHECKTYPES - #endif -- | Py_TPFLAGS_HAVE_GC - | Py_TPFLAGS_BASETYPE, /* tp_flags */ - 0, /* tp_doc */ - 0, /* tp_traverse */ - diff --git a/dev-libs/boost/files/boost-1.80.0-unary-function.patch b/dev-libs/boost/files/boost-1.80.0-unary-function.patch deleted file mode 100644 index 7941d7c66395..000000000000 --- a/dev-libs/boost/files/boost-1.80.0-unary-function.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/869401 -https://github.com/boostorg/config/commit/f0af4a9184457939b89110795ae2d293582c5f66 -https://github.com/boostorg/container_hash/issues/24 - -From: jzmaddock <john@johnmaddock.co.uk> -Date: Mon, 11 Jul 2022 18:26:07 +0100 -Subject: [PATCH] The std lib unary/binary_function base classes are - deprecated/removed from libcpp15. Fixes - https://github.com/boostorg/container_hash/issues/24. - ---- a/boost/config/stdlib/libcpp.hpp -+++ b/boost/config/stdlib/libcpp.hpp -@@ -168,4 +168,13 @@ - # define BOOST_NO_CXX14_HDR_SHARED_MUTEX - #endif - -+#if _LIBCPP_VERSION >= 15000 -+// -+// Unary function is now deprecated in C++11 and later: -+// -+#if __cplusplus >= 201103L -+#define BOOST_NO_CXX98_FUNCTION_BASE -+#endif -+#endif -+ - // --- end --- - diff --git a/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch b/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch deleted file mode 100644 index 51776094386e..000000000000 --- a/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch +++ /dev/null @@ -1,192 +0,0 @@ -From f9eae4153f4ea9aac4b6c46e660ec92824d5827f Mon Sep 17 00:00:00 2001 -From: Christian Mazakas <christian.mazakas@gmail.com> -Date: Tue, 16 Aug 2022 14:34:58 -0700 -Subject: [PATCH] Update code to be valid when the internal `buckets_` data - member is moved-from - ---- - boost/unordered/detail/fca.hpp | 18 +++++-- - .../boost/unordered/detail/implementation.hpp | 49 +++++++++++-------- - boost/unordered/unordered_map.hpp | 8 +++ - boost/unordered/unordered_set.hpp | 8 +++ - 4 files changed, 58 insertions(+), 25 deletions(-) - -diff --git a/boost/unordered/detail/fca.hpp b/boost/unordered/detail/fca.hpp -index 19fafe739..a1d14d957 100644 ---- a/boost/unordered/detail/fca.hpp -+++ b/boost/unordered/detail/fca.hpp -@@ -646,7 +646,7 @@ namespace boost { - - size_type bucket_count() const { return size_; } - -- iterator begin() const { return ++at(size_); } -+ iterator begin() const { return size_ == 0 ? end() : ++at(size_); } - - iterator end() const - { -@@ -660,6 +660,10 @@ namespace boost { - - local_iterator begin(size_type n) const - { -+ if (size_ == 0) { -+ return this->end(n); -+ } -+ - return local_iterator( - (buckets + static_cast<difference_type>(n))->next); - } -@@ -670,12 +674,16 @@ namespace boost { - - iterator at(size_type n) const - { -- std::size_t const N = group::N; -+ if (size_ > 0) { -+ std::size_t const N = group::N; - -- iterator pbg(buckets + static_cast<difference_type>(n), -- groups + static_cast<difference_type>(n / N)); -+ iterator pbg(buckets + static_cast<difference_type>(n), -+ groups + static_cast<difference_type>(n / N)); - -- return pbg; -+ return pbg; -+ } else { -+ return this->end(); -+ } - } - - span<Bucket> raw() -diff --git a/boost/unordered/detail/implementation.hpp b/boost/unordered/detail/implementation.hpp -index 2cc27c5d4..373236754 100644 ---- a/boost/unordered/detail/implementation.hpp -+++ b/boost/unordered/detail/implementation.hpp -@@ -2054,12 +2054,14 @@ namespace boost { - - std::size_t bucket_size(std::size_t index) const - { -- bucket_iterator itb = buckets_.at(index); -- node_pointer n = itb->next; - std::size_t count = 0; -- while (n) { -- ++count; -- n = n->next; -+ if (size_ > 0) { -+ bucket_iterator itb = buckets_.at(index); -+ node_pointer n = itb->next; -+ while (n) { -+ ++count; -+ n = n->next; -+ } - } - return count; - } -@@ -2420,11 +2422,14 @@ namespace boost { - node_pointer find_node_impl( - Key const& x, bucket_iterator itb) const - { -- key_equal const& pred = this->key_eq(); -- node_pointer p = itb->next; -- for (; p; p = p->next) { -- if (pred(x, extractor::extract(p->value()))) { -- break; -+ node_pointer p = node_pointer(); -+ if (itb != buckets_.end()) { -+ key_equal const& pred = this->key_eq(); -+ p = itb->next; -+ for (; p; p = p->next) { -+ if (pred(x, extractor::extract(p->value()))) { -+ break; -+ } - } - } - return p; -@@ -2453,11 +2458,13 @@ namespace boost { - inline iterator transparent_find( - Key const& k, Hash const& h, Pred const& pred) const - { -- std::size_t const key_hash = h(k); -- bucket_iterator itb = buckets_.at(buckets_.position(key_hash)); -- for (node_pointer p = itb->next; p; p = p->next) { -- if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) { -- return iterator(p, itb); -+ if (size_ > 0) { -+ std::size_t const key_hash = h(k); -+ bucket_iterator itb = buckets_.at(buckets_.position(key_hash)); -+ for (node_pointer p = itb->next; p; p = p->next) { -+ if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) { -+ return iterator(p, itb); -+ } - } - } - -@@ -2467,11 +2474,13 @@ namespace boost { - template <class Key> - node_pointer* find_prev(Key const& key, bucket_iterator itb) - { -- key_equal pred = this->key_eq(); -- for (node_pointer* pp = boost::addressof(itb->next); *pp; -- pp = boost::addressof((*pp)->next)) { -- if (pred(key, extractor::extract((*pp)->value()))) { -- return pp; -+ if (size_ > 0) { -+ key_equal pred = this->key_eq(); -+ for (node_pointer* pp = boost::addressof(itb->next); *pp; -+ pp = boost::addressof((*pp)->next)) { -+ if (pred(key, extractor::extract((*pp)->value()))) { -+ return pp; -+ } - } - } - typedef node_pointer* node_pointer_pointer; -diff --git a/boost/unordered/unordered_map.hpp b/boost/unordered/unordered_map.hpp -index 97908fb65..3e25a28a2 100644 ---- a/boost/unordered/unordered_map.hpp -+++ b/boost/unordered/unordered_map.hpp -@@ -2069,6 +2069,10 @@ namespace boost { - template <class K, class T, class H, class P, class A> - float unordered_map<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT - { -+ if (table_.size_ == 0) { -+ return 0.0f; -+ } -+ - BOOST_ASSERT(table_.bucket_count() != 0); - return static_cast<float>(table_.size_) / - static_cast<float>(table_.bucket_count()); -@@ -2506,6 +2510,10 @@ namespace boost { - template <class K, class T, class H, class P, class A> - float unordered_multimap<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT - { -+ if (table_.size_ == 0) { -+ return 0.0f; -+ } -+ - BOOST_ASSERT(table_.bucket_count() != 0); - return static_cast<float>(table_.size_) / - static_cast<float>(table_.bucket_count()); -diff --git a/boost/unordered/unordered_set.hpp b/boost/unordered/unordered_set.hpp -index 8721a68a0..82d323c6e 100644 ---- a/boost/unordered/unordered_set.hpp -+++ b/boost/unordered/unordered_set.hpp -@@ -1586,6 +1586,10 @@ namespace boost { - template <class T, class H, class P, class A> - float unordered_set<T, H, P, A>::load_factor() const BOOST_NOEXCEPT - { -+ if (table_.size_ == 0) { -+ return 0.0f; -+ } -+ - BOOST_ASSERT(table_.bucket_count() != 0); - return static_cast<float>(table_.size_) / - static_cast<float>(table_.bucket_count()); -@@ -1986,6 +1990,10 @@ namespace boost { - template <class T, class H, class P, class A> - float unordered_multiset<T, H, P, A>::load_factor() const BOOST_NOEXCEPT - { -+ if (table_.size_ == 0) { -+ return 0.0f; -+ } -+ - BOOST_ASSERT(table_.bucket_count() != 0); - return static_cast<float>(table_.size_) / - static_cast<float>(table_.bucket_count()); diff --git a/dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch b/dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch deleted file mode 100644 index 95b39e4bb6be..000000000000 --- a/dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/boostorg/align/commit/5ad7df63cd792fbdb801d600b93cad1a432f0151 -https://github.com/boostorg/align/pull/19 - -From 5ad7df63cd792fbdb801d600b93cad1a432f0151 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira=20Rolim?= - <34201958+ericonr@users.noreply.github.com> -Date: Fri, 11 Nov 2022 18:29:45 -0300 -Subject: [PATCH] Don't use FTMs to determine implementation choice - ---- a/boost/align/aligned_alloc.hpp -+++ b/boost/align/aligned_alloc.hpp -@@ -38,7 +38,7 @@ Distributed under the Boost Software License, Version 1.0. - #include <boost/align/detail/aligned_alloc_posix.hpp> - #elif defined(sun) || defined(__sun) - #include <boost/align/detail/aligned_alloc_sunos.hpp> --#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600) -+#elif defined(_POSIX_VERSION) - #include <boost/align/detail/aligned_alloc_posix.hpp> - #else - #include <boost/align/detail/aligned_alloc.hpp> - diff --git a/dev-libs/boost/files/boost-1.82.0-context-arm64.patch b/dev-libs/boost/files/boost-1.82.0-context-arm64.patch new file mode 100644 index 000000000000..a4efac7f2f62 --- /dev/null +++ b/dev-libs/boost/files/boost-1.82.0-context-arm64.patch @@ -0,0 +1,19 @@ +https://github.com/boostorg/context/commit/d039c8e4da79dbc76481236249e22892bfdde047 +https://bugs.gentoo.org/904132 + +From d039c8e4da79dbc76481236249e22892bfdde047 Mon Sep 17 00:00:00 2001 +From: Nikita Kniazev <nok.raven@gmail.com> +Date: Thu, 23 Mar 2023 16:23:07 +0300 +Subject: [PATCH] Fix arm64 detection broken by recent B2 change + +--- a/libs/context/build/Jamfile.v2 ++++ b/libs/context/build/Jamfile.v2 +@@ -79,7 +79,7 @@ local rule default_abi ( ) + local tmp = sysv ; + if [ os.name ] = "NT" { tmp = ms ; } + else if [ os.name ] = "CYGWIN" { tmp = ms ; } +- else if [ os.platform ] = "ARM" { tmp = aapcs ; } ++ else if [ os.platform ] in ARM ARM64 { tmp = aapcs ; } + else if [ os.platform ] = "MIPS32" { tmp = o32 ; } + else if [ os.platform ] = "MIPS64" { tmp = n64 ; } + return $(tmp) ; diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index 1371878c4608..f1e5e9e25a16 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -2,3 +2,5 @@ DIST Botan-2.19.2.tar.xz 6063336 BLAKE2B a46fa49c61846e718197ab3a8431a5bdcab0f4c 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 diff --git a/dev-libs/botan/botan-2.19.3.ebuild b/dev-libs/botan/botan-2.19.3-r2.ebuild index 10d64d9a5ec0..3059e4d2c09e 100644 --- a/dev-libs/botan/botan-2.19.3.ebuild +++ b/dev-libs/botan/botan-2.19.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +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 @@ -15,7 +15,8 @@ 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 +# 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" IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" RESTRICT="!test? ( test )" @@ -39,7 +40,10 @@ DEPEND=" sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= ) " -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + !<dev-libs/botan-3.0.0-r1:3[tools] +" BDEPEND=" ${PYTHON_DEPS} $(python_gen_any_dep ' @@ -115,7 +119,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) @@ -132,6 +136,8 @@ src_configure() { --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) @@ -167,14 +173,19 @@ src_configure() { } src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" + LD_LIBRARY_PATH="${S}" ./botan-test$(ver_cut 1) || die "Validation tests failed" } src_install() { default + if [[ -d "${ED}"/usr/share/doc/${P} ]] ; 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/botan-3.0.0-r2.ebuild b/dev-libs/botan/botan-3.0.0-r2.ebuild new file mode 100644 index 000000000000..866ca3ab1f23 --- /dev/null +++ b/dev-libs/botan/botan-3.0.0-r2.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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 + +MY_P="Botan-${PV}" +DESCRIPTION="C++ crypto library" +HOMEPAGE="https://botan.randombit.net/" +SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" +SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )" +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" +IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" +RESTRICT="!test? ( test )" + +CPU_USE=( + cpu_flags_arm_{aes,neon} + cpu_flags_ppc_altivec + cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2} +) + +IUSE+=" ${CPU_USE[@]}" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# NOTE: Boost is needed at runtime too for the CLI tool. +DEPEND=" + boost? ( dev-libs/boost:= ) + bzip2? ( >=app-arch/bzip2-1.0.5:= ) + lzma? ( app-arch/xz-utils:= ) + python? ( ${PYTHON_DEPS} ) + sqlite? ( dev-db/sqlite:3= ) + zlib? ( >=sys-libs/zlib-1.2.3:= ) +" +RDEPEND=" + ${DEPEND} + !<dev-libs/botan-2.19.3-r1:2[tools] +" +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ' + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + ') + 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 + +python_check_deps() { + use doc || return 0 + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +src_configure() { + python_setup + + local disable_modules=( + $(usev !boost 'boost') + ) + + if [[ -z "${DISABLE_MODULES}" ]] ; then + elog "Disabling module(s): ${disable_modules[@]}" + fi + + local chostarch="${CHOST%%-*}" + + # Arch specific wrangling + local myos= + case ${CHOST} in + *-darwin*) + myos=darwin + ;; + *) + myos=linux + + if [[ ${CHOST} == *hppa* ]] ; then + chostarch=parisc + elif [[ ${ABI} == sparc64 ]] ; then + chostarch="sparc64" + elif [[ ${ABI} == sparc32 ]] ; then + chostarch="sparc32" + fi + ;; + esac + + local pythonvers=() + if use python ; then + _append() { + pythonvers+=( ${EPYTHON/python/} ) + } + + python_foreach_impl _append + fi + + local myargs=( + # Intrinsics + # TODO: x86 RDSEED (new CPU_FLAGS_X86?) + # TODO: POWER Crypto (new CPU_FLAGS_PPC?) + $(usev !cpu_flags_arm_aes '--disable-armv8crypto') + $(usev !cpu_flags_arm_neon '--disable-neon') + $(usev !cpu_flags_ppc_altivec '--disable-altivec') + $(usev !cpu_flags_x86_aes '--disable-aes-ni') + $(usev !cpu_flags_x86_avx2 '--disable-avx2') + $(usev !cpu_flags_x86_popcnt '--disable-bmi2') + $(usev !cpu_flags_x86_rdrand '--disable-rdrand') + $(usev !cpu_flags_x86_sha '--disable-sha-ni') + $(usev !cpu_flags_x86_sse2 '--disable-sse2') + $(usev !cpu_flags_x86_ssse3 '--disable-ssse3') + $(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 + $(usev hppa '--without-stack-protector') + + $(use_with boost) + $(use_with bzip2) + $(use_with doc documentation) + $(use_with doc sphinx) + $(use_with lzma) + $(use_enable static-libs static-library) + $(use_with sqlite sqlite3) + $(use_with zlib) + + --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) + # bug #723096 + --no-install-python-module + + --os=${myos} + --prefix="${EPREFIX}"/usr + --with-endian="$(tc-endian)" + --with-python-version=$(IFS=","; echo "${pythonvers[*]}") + ) + + local build_targets=( + shared + $(usev static-libs static) + $(usev tools cli) + $(usev test tests) + ) + + myargs+=( + --build-targets=$(IFS=","; echo "${build_targets[*]}") + ) + + if use elibc_glibc && use kernel_linux ; then + myargs+=( + --with-os-features=getrandom,getentropy + ) + fi + + tc-export AR CC CXX + + edo ${EPYTHON} configure.py --verbose "${myargs[@]}" +} + +src_test() { + LD_LIBRARY_PATH="${S}" ./botan-test$(ver_cut 1) || die "Validation tests failed" +} + +src_install() { + default + + if [[ -d "${ED}"/usr/share/doc/${P} ]] ; 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/botan$(ver_cut 1).py + fi +} diff --git a/dev-libs/boxfort/boxfort-0.1.1.ebuild b/dev-libs/boxfort/boxfort-0.1.1.ebuild index 8a8774e348b1..c7cabdbb8bf7 100644 --- a/dev-libs/boxfort/boxfort-0.1.1.ebuild +++ b/dev-libs/boxfort/boxfort-0.1.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-any-r1 diff --git a/dev-libs/boxfort/boxfort-0.1.4.ebuild b/dev-libs/boxfort/boxfort-0.1.4.ebuild index 45d8dc65c1d9..5ba94e06da9f 100644 --- a/dev-libs/boxfort/boxfort-0.1.4.ebuild +++ b/dev-libs/boxfort/boxfort-0.1.4.ebuild @@ -3,7 +3,7 @@ EAPI="8" -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-any-r1 diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest index 24d850467100..8929119daeb4 100644 --- a/dev-libs/c-blosc/Manifest +++ b/dev-libs/c-blosc/Manifest @@ -1 +1,2 @@ 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 diff --git a/dev-libs/c-blosc/c-blosc-1.21.4.ebuild b/dev-libs/c-blosc/c-blosc-1.21.4.ebuild new file mode 100644 index 000000000000..a5c63c1a8c94 --- /dev/null +++ b/dev-libs/c-blosc/c-blosc-1.21.4.ebuild @@ -0,0 +1,53 @@ +# 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-blosc2/Manifest b/dev-libs/c-blosc2/Manifest index f4508df3f2a7..10231529e8b2 100644 --- a/dev-libs/c-blosc2/Manifest +++ b/dev-libs/c-blosc2/Manifest @@ -1 +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 diff --git a/dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild index e4d54a7ad7a7..e5125d6eca4c 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.6.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 @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +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 )" diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild new file mode 100644 index 000000000000..842752b8909c --- /dev/null +++ b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild @@ -0,0 +1,65 @@ +# 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/c-blosc2/c-blosc2.html + https://github.com/Blosc/c-blosc2/ +" +SRC_URI=" + https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +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" +REQUIRED_USE="test? ( zlib zstd )" +RESTRICT="!test? ( test )" + +DEPEND=" + >=app-arch/lz4-1.7.5:= + zlib? ( sys-libs/zlib:= ) + zstd? ( app-arch/zstd:= ) +" +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 + + local mycmakeargs=( + -DBUILD_STATIC=OFF + -DBUILD_TESTS=$(usex test) + -DBUILD_BENCHMARKS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_FUZZERS=OFF + -DDEACTIVATE_ZLIB=$(usex !zlib) + -DDEACTIVATE_ZSTD=$(usex !zstd) + -DPREFER_EXTERNAL_LZ4=ON + -DPREFER_EXTERNAL_ZLIB=ON + -DPREFER_EXTERNAL_ZSTD=ON + + # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults + # from applying, https://github.com/Blosc/c-blosc2/issues/433 + -DCMAKE_C_FLAGS="${CFLAGS}" + ) + cmake_src_configure +} + +src_test() { + # Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432 + MAKEOPTS=-j1 cmake_src_test +} diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.2.ebuild new file mode 100644 index 000000000000..1a7c40ef0f55 --- /dev/null +++ b/dev-libs/c-blosc2/c-blosc2-2.9.2.ebuild @@ -0,0 +1,60 @@ +# 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/c-blosc2/c-blosc2.html + https://github.com/Blosc/c-blosc2/ +" +SRC_URI=" + https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +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" +REQUIRED_USE="test? ( zlib zstd )" +RESTRICT="!test? ( test )" + +DEPEND=" + >=app-arch/lz4-1.7.5:= + 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_EXAMPLES=OFF + -DBUILD_FUZZERS=OFF + -DDEACTIVATE_ZLIB=$(usex !zlib) + -DDEACTIVATE_ZSTD=$(usex !zstd) + -DPREFER_EXTERNAL_LZ4=ON + -DPREFER_EXTERNAL_ZLIB=ON + -DPREFER_EXTERNAL_ZSTD=ON + + # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults + # from applying, https://github.com/Blosc/c-blosc2/issues/433 + -DCMAKE_C_FLAGS="${CFLAGS}" + ) + cmake_src_configure +} + +src_test() { + # Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432 + MAKEOPTS=-j1 cmake_src_test +} 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 new file mode 100644 index 000000000000..5ec28e936de7 --- /dev/null +++ b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch @@ -0,0 +1,26 @@ +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/capnproto/Manifest b/dev-libs/capnproto/Manifest index bedc589fb927..84e5ab808603 100644 --- a/dev-libs/capnproto/Manifest +++ b/dev-libs/capnproto/Manifest @@ -1,2 +1,3 @@ DIST capnproto-0.10.2.tar.gz 2279393 BLAKE2B d78442bc122bc976fb636dfde694e10414bf3468ead903fac7ba59cbd81a49ce94969954fdc90f92f7f58f0af80f2da1f70de9b461d99fc6ae9a9e7aa9cd0500 SHA512 079ab715ea19ac207f72bb4874ab6362c11dfb9128342ec937e3f4d27e4100530cf9e6a0275eaca1e45a1bb706b65179a526ea8cfceba93bb36cd6c4f1c0cf5b +DIST capnproto-0.10.4.tar.gz 2280389 BLAKE2B 3a893b766302a96df71763613fa1624f6b7229b8926099d1d9c217f4a1817db16aa24d3bec7950e480da6b027bd9b6b0b5a4083e982e7bda8fc6594794fd379a SHA512 6179a202399f4391014827799c954e0b3ad811ab82ebd0addc01d8c7695b9c1a9c0a0c26b018cd392e3731e12b30cca58545459d1b3a140e86e34b75d7eacbc7 DIST capnproto-0.9.1.tar.gz 2238849 BLAKE2B f8de56c7f79b0ddad35f3e8fec7740510ca2328e4ddc633a71420901d3fc44df44d807c3965213dfc2535bbe03832c5164242d33cd0bff901d6f288fb62bab21 SHA512 bdc5960f26214139744d768ca4558b085e2d359c375a8849ca532a4c458a2daf0ee1a1f4d00745de5abf353aa1e4084a2d85e5523006f23f591f21fac2d847fd diff --git a/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild b/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild new file mode 100644 index 000000000000..30c2d9f10ffc --- /dev/null +++ b/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="RPC/Serialization system with capabilities support" +HOMEPAGE="https://capnproto.org" +SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P}/c++ + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ssl test zlib" + +RESTRICT="!test? ( test )" + +RDEPEND=" + ssl? ( dev-libs/openssl:= ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" + +src_configure() { + append-atomic-flags + if [[ ${LIBS} == *atomic* ]] ; then + # append-libs won't work here, cmake doesn't respect it + # ... and ldflags gets missed once + append-flags -latomic + fi + + local mycmakeargs=( + -DWITH_OPENSSL=$(usex ssl) + -DBUILD_TESTING=$(usex test) + $(cmake_use_find_package zlib ZLIB) + ) + cmake_src_configure +} + +src_test() { + cmake_build check +} diff --git a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild new file mode 100644 index 000000000000..c2a407fa7ca8 --- /dev/null +++ b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild @@ -0,0 +1,95 @@ +# 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} ) +DISTUTILS_USE_PEP517=setuptools + +inherit cmake distutils-r1 toolchain-funcs + +DESCRIPTION="disassembly/disassembler framework + bindings" +HOMEPAGE="https://www.capstone-engine.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + 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 ~ppc ~ppc64 ~riscv x86" +fi + +LICENSE="BSD" +SLOT="0/5" # libcapstone.so.5 + +IUSE="python static-libs test" +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) +" +BDEPEND="${DISTUTILS_DEPS}" +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="" +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} + + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi +} diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild index 259fa40dbb50..ef624cde1cad 100644 --- a/dev-libs/capstone/capstone-9999.ebuild +++ b/dev-libs/capstone/capstone-9999.ebuild @@ -5,6 +5,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools inherit cmake distutils-r1 toolchain-funcs @@ -17,23 +18,23 @@ if [[ ${PV} == 9999 ]]; then 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" fi LICENSE="BSD" SLOT="0/5" # libcapstone.so.5 -IUSE="python test" +IUSE="python static-libs test" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) " +BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" distutils_enable_tests setup.py -S=${WORKDIR}/${P/_rc/-rc} - if [[ ${PV} == *_rc* ]]; then # Upstream doesn't flag release candidates (bug 858350) QA_PKGCONFIG_VERSION="" @@ -82,4 +83,8 @@ src_install() { cmake_src_install wrap_python ${FUNCNAME} + + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi } diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest index de8dcc691a90..02a4af51321f 100644 --- a/dev-libs/castxml/Manifest +++ b/dev-libs/castxml/Manifest @@ -1,2 +1 @@ -DIST castxml-0.4.5.tar.gz 104158 BLAKE2B 7d1642442d6908a7d7e1dd8f80a37b55ec8652191c4c93faf7f45601d730653d9b0e5af601f74aca7bce8579c0006eab0e9a2a75752abe2acbec1cfbf1522645 SHA512 c35c5d60dc7487d5dddba34de92590122db8457659458ee4e735fe9936dc59473bd31ed602e05e73651780f25a55ef5554e2daec0923ffb5a7575904320f5352 DIST castxml-0.5.1.tar.gz 106918 BLAKE2B 9268f149ea5a511d24cbbd0c7faec5bff5eade5a511961d3bb120409691bf2b8aca7f2978e048a759419c097d9d97219a61a122bd37d4f835c1d86827bfb07e3 SHA512 1dff8f5cc6932a159e1132c0b283a28414ea6007c942cac4ae15a1c31789f5bd29efd65a6b5b63d7bc48b3d68c3550804f31bee2658e51082269fc5ecc15590e diff --git a/dev-libs/castxml/castxml-0.4.5.ebuild b/dev-libs/castxml/castxml-0.5.1-r1.ebuild index 7eee74c7e25a..3c2b41567323 100644 --- a/dev-libs/castxml/castxml-0.4.5.ebuild +++ b/dev-libs/castxml/castxml-0.5.1-r1.ebuild @@ -1,40 +1,44 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +LLVM_MAX_SLOT=15 +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/llvm:= - sys-devel/clang:= - " + <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= +" DEPEND="${RDEPEND}" BDEPEND=" - ${RDEPEND} - man? ( dev-python/sphinx ) - " + ${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/${P}" + -DCastXML_INSTALL_DOC_DIR="share/doc/${PF}" -DCastXML_INSTALL_MAN_DIR="share/man" -DSPHINX_MAN="$(usex man)" -DSPHINX_HTML=OFF diff --git a/dev-libs/castxml/castxml-0.5.1.ebuild b/dev-libs/castxml/castxml-0.5.1.ebuild deleted file mode 100644 index 7eee74c7e25a..000000000000 --- a/dev-libs/castxml/castxml-0.5.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -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 )" - -RDEPEND=" - sys-devel/llvm:= - sys-devel/clang:= - " -DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} - man? ( dev-python/sphinx ) - " - -PATCHES=( - "${FILESDIR}"/${PN}-fix-tests.patch -) - -src_configure() { - local mycmakeargs=( - -DCastXML_INSTALL_DOC_DIR="share/doc/${P}" - -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/cdk/Manifest b/dev-libs/cdk/Manifest index a69033cc63bc..cebc82602311 100644 --- a/dev-libs/cdk/Manifest +++ b/dev-libs/cdk/Manifest @@ -1,4 +1,5 @@ DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef073db54272e4a8d2bd7d83093888f2ca9e5ee9c2d067777472d2abb87cca42b2912b0491b81472cfce086640b8 SHA512 72d62307824708858ca4fb3865d332cc81e987d7ef685011cf127c8f77cee3e19fe9dd6a35009d4416769cb00f04e937ebaec686c61ca0ba58655f522a175a59 -DIST cdk-5.0-20211216.tgz 552041 BLAKE2B ce82ac22d4ec2ed37079d3de52a4f93a4206e5228aa952a3e45294d260c1ffef7c363b2c290060cc909bb8ab4ae88cbedecf498db7bd0f13e2d2822d87d7e4fa SHA512 622e99681af8468aaf8638833d0821c743667fb9b41716fe16acb8e78e8a3d5ba4eb7aced0bc213697e120dcb6e96067d6b75d53531555c3e6d90e4961cb99aa DIST cdk-5.0-20221025.tgz 540925 BLAKE2B 48b37d07630bc71fc5b1a77fa2732c264e61323fc00c60db1436403db46bfc4f870fa897560b705583b07db84b8f812df553780f4bddef4ca88de6b799c31f57 SHA512 408ab61f8110c13d32976896e92f8ded4927eac36435bce6d9fafbe137e693779ffd882829712086868766a252e35e6c592da69c43cfb32d9f4cf7e880c2a593 DIST cdk-5.0-20221025.tgz.asc 729 BLAKE2B 0e6d0fdfcdb7e8a2139b5050cd2ff79f493edb67a0119baf5b009a00ea9fe715bb85da7980f35dbf688462b8dc07fc1e630101b072111fc626696bb90d318dc8 SHA512 66c52ac973fa6c133ae5a76b1661980b6a32144854c518f9bcddce8bd0b28e60167f8e09f87b99bff59e996275b3844f2c1c4b20d0a40a784700f53394fcbbcc +DIST cdk-5.0-20230201.tgz 533972 BLAKE2B 8667583ea1401ab04dc43dbd93f8580ee898c351f52552889fb642f38ad85536f5fbcc6724659bff83a1f9adc1addf5632c39d9162b628efd341f45e94b2b823 SHA512 2b072dc5eba66bb043f56c5d558ddafb0d9281160107f901b5b4c262182946b7c55cf5b1bdf0d0536fd7db6d95fd6b3ddd9dd367fccc63bb0d95eb3c98da58fd +DIST cdk-5.0-20230201.tgz.asc 729 BLAKE2B 9076836bb6fd8f89ad4c474b7fc2beb3fa9fd16a3c2d530ce34052af65231e2d77f3879d02ca031be6a7bdac6bba29f40bac3320fc513fc3ba5e617316184ed4 SHA512 85e80c49049da9cd335013e564fd15929a127b3fec24bdb50d153196b47f4092c353a7bd6a40211566a7f4d09701cc75d66f9b3b32fed50c6b728e17dc7a166a diff --git a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild index 716d6a145960..5e37532139ba 100644 --- a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild +++ b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples unicode" DEPEND="sys-libs/ncurses:=[unicode(+)?]" diff --git a/dev-libs/cdk/cdk-5.0.20221025.ebuild b/dev-libs/cdk/cdk-5.0.20221025.ebuild index c974d478f4bd..10c92d5e51b7 100644 --- a/dev-libs/cdk/cdk-5.0.20221025.ebuild +++ b/dev-libs/cdk/cdk-5.0.20221025.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 @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="MIT" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples unicode" DEPEND="sys-libs/ncurses:=[unicode(+)?]" diff --git a/dev-libs/cdk/cdk-5.0.20211216.ebuild b/dev-libs/cdk/cdk-5.0.20230201.ebuild index 238113a9aaba..10c92d5e51b7 100644 --- a/dev-libs/cdk/cdk-5.0.20211216.ebuild +++ b/dev-libs/cdk/cdk-5.0.20230201.ebuild @@ -1,23 +1,30 @@ -# 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 MY_P="${PN}-$(ver_rs 2 -)" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig + DESCRIPTION="A library of curses widgets" HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots" -SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz" +SRC_URI="https://invisible-island.net/archives/${PN}/${MY_P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${MY_P}.tgz.asc )" S="${WORKDIR}"/${MY_P} -LICENSE="BSD" +LICENSE="MIT" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples unicode" DEPEND="sys-libs/ncurses:=[unicode(+)?]" RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) +" src_configure() { if [[ ${CHOST} == *-*-darwin* ]] ; then diff --git a/dev-libs/cereal/cereal-1.3.2-r2.ebuild b/dev-libs/cereal/cereal-1.3.2-r2.ebuild index 57da97a7a8ca..052f9273e3b8 100644 --- a/dev-libs/cereal/cereal-1.3.2-r2.ebuild +++ b/dev-libs/cereal/cereal-1.3.2-r2.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/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~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 new file mode 100644 index 000000000000..4b9a3c5baa8c --- /dev/null +++ b/dev-libs/cglm/Manifest @@ -0,0 +1 @@ +DIST cglm-0.8.9.tar.gz 631331 BLAKE2B 17f6f8d379aa81ee9327315b121cc7629fcc394fe032c1e1540e5153b2d3b0a2129f27eb46a8ae4323aa826b2bfff310b9039f78953d52d0bd994ba493fcdbd9 SHA512 ac0a042d61c60eac7d6616e5bc0f5c3e77b1a45f58f6732b34edc9a0d714046777e4b490200a3b54c6325ddad5b5faeb3648a299685f748f8b0618ce66a9a7f4 diff --git a/dev-libs/cglm/cglm-0.8.9-r1.ebuild b/dev-libs/cglm/cglm-0.8.9-r1.ebuild new file mode 100644 index 000000000000..8adee7688d32 --- /dev/null +++ b/dev-libs/cglm/cglm-0.8.9-r1.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/cglm/cglm-0.8.9.ebuild b/dev-libs/cglm/cglm-0.8.9.ebuild new file mode 100644 index 000000000000..c08a2059bd9c --- /dev/null +++ b/dev-libs/cglm/cglm-0.8.9.ebuild @@ -0,0 +1,24 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit 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_configure() { + local emesonargs=( + "-Dwerror=false" + $(meson_use test build_tests) + ) + meson_src_configure +} diff --git a/dev-libs/cglm/metadata.xml b/dev-libs/cglm/metadata.xml new file mode 100644 index 000000000000..43c3fb2ea750 --- /dev/null +++ b/dev-libs/cglm/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="github">recp/cglm</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/check/check-0.15.2-r1.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild index 5110f922f963..d332e7946c17 100644 --- a/dev-libs/check/check-0.15.2-r1.ebuild +++ b/dev-libs/check/check-0.15.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz" 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 ~sparc-solaris ~x64-solaris ~x86-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" IUSE="doc subunit test" # Tests seem to timeout on ppc* systems, #736661 diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r2.ebuild index abdf79cf4f16..cdbdd764997e 100644 --- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild +++ b/dev-libs/chmlib/chmlib-0.40-r2.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 @@ -17,6 +17,7 @@ IUSE="+examples static-libs" PATCHES=( "${FILESDIR}"/${PN}-0.39-stdtypes.patch "${FILESDIR}"/${P}-headers.patch + "${FILESDIR}"/${P}-clang16.patch ) src_prepare() { diff --git a/dev-libs/chmlib/files/chmlib-0.40-clang16.patch b/dev-libs/chmlib/files/chmlib-0.40-clang16.patch new file mode 100644 index 000000000000..eb66b91d5556 --- /dev/null +++ b/dev-libs/chmlib/files/chmlib-0.40-clang16.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/871177 +https://github.com/jedwing/CHMLib/pull/17 + +From 5877959e3eb9a54e131608c52e2d6f4c89bc0189 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Wed, 19 Apr 2023 09:47:03 +0200 +Subject: [PATCH] Avoid implicit function declarations, for C99 compatibility + +Define _LARGEFILE64_SOURCE so that <unistd.h> defines pread64. + +This avoids build failures with future compilers which do not +support implicit function declarations by default. +--- a/src/chm_lib.c ++++ b/src/chm_lib.c +@@ -48,6 +48,8 @@ + * * + ***************************************************************************/ + ++#define _LARGEFILE64_SOURCE /* for pread64 */ ++ + #include "chm_lib.h" + + #ifdef CHM_MT + diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest index 167ed1854c50..65c9a396443f 100644 --- a/dev-libs/clhpp/Manifest +++ b/dev-libs/clhpp/Manifest @@ -1 +1,2 @@ -DIST clhpp-2.0.19.tar.gz 106871 BLAKE2B e8c94f3e242d272a7eedbb13f7ead89cacaffdeca8b837fab29eb023e60efc7eb730b3966702474168071e7c884801fa24f0eedad95f6ea866f27dddb3af4a4e SHA512 f2d37eaee7a46b505844ddf45ae94f5f94241dea0b8f03f6bf4ba7524d7556c9ed19cc2f702cdd9becc469816ffa3d8371ae3561aebff5486cae9b623a10f58b +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-2.0.19.ebuild b/dev-libs/clhpp/clhpp-2.0.19.ebuild deleted file mode 100644 index 419b89e9488e..000000000000 --- a/dev-libs/clhpp/clhpp-2.0.19.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby26 ruby27 ruby30" -RUBY_OPTIONAL="yes" - -inherit cmake ruby-ng - -MY_PN="OpenCL-CLHPP" -MY_PV="2022.09.30" -MY_P="${MY_PN}-${MY_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${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Khronos-CLHPP" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -# Tests require CMock (NOT cmocka), which is currently unpackaged -RESTRICT="test" - -RDEPEND="virtual/opencl" -DEPEND="${RDEPEND} - >=dev-util/opencl-headers-${MY_PV}" -BDEPEND="test? ( $(ruby_implementations_depend) )" - -S="${WORKDIR}"/${MY_P} - -pkg_setup() { - use test && ruby-ng_pkg_setup -} - -src_unpack() { - # suppress ruby-ng export - default -} - -src_prepare() { - # suppress ruby-ng export - cmake_src_prepare -} - -src_compile() { - # suppress ruby-ng export - cmake_src_compile -} - -src_install() { - # suppress ruby-ng export - cmake_src_install -} - -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.02.06.ebuild b/dev-libs/clhpp/clhpp-2023.02.06.ebuild new file mode 100644 index 000000000000..366b4f04fcb7 --- /dev/null +++ b/dev-libs/clhpp/clhpp-2023.02.06.ebuild @@ -0,0 +1,39 @@ +# 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 new file mode 100644 index 000000000000..a9a4c55d1789 --- /dev/null +++ b/dev-libs/clhpp/clhpp-2023.04.17.ebuild @@ -0,0 +1,39 @@ +# 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/confuse/confuse-3.3-r1.ebuild b/dev-libs/confuse/confuse-3.3-r1.ebuild index cb45a91f7a41..164f9d86f456 100644 --- a/dev-libs/confuse/confuse-3.3-r1.ebuild +++ b/dev-libs/confuse/confuse-3.3-r1.ebuild @@ -5,12 +5,12 @@ 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" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="nls static-libs" diff --git a/dev-libs/confuse/confuse-3.3-r2.ebuild b/dev-libs/confuse/confuse-3.3-r2.ebuild new file mode 100644 index 000000000000..6a45dae70813 --- /dev/null +++ b/dev-libs/confuse/confuse-3.3-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit multilib-minimal flag-o-matic + +DESCRIPTION="a configuration file parser library" +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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +IUSE="nls static-libs" + +BDEPEND=" + sys-devel/flex + sys-devel/libtool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +RDEPEND=" + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) +" + +PATCHES=( + # Upstream commit to fix CVE-2022-40320: + # https://github.com/libconfuse/libconfuse/commit/d73777c2c3566fb2647727bb56d9a2295b81669b + "${FILESDIR}"/confuse-3.3-fix-CVE-2022-40320.patch +) + +DOCS=( AUTHORS ) + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + # https://github.com/libconfuse/libconfuse/pull/167 + append-lfs-flags + + # examples are normally compiled but not installed. They + # fail during a mingw crosscompile. + local ECONF_SOURCE=${BUILD_DIR} + econf \ + --enable-shared \ + --disable-examples \ + $(use_enable nls) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + doman doc/man/man3/*.3 + dodoc -r doc/html + + docinto examples + dodoc examples/*.{c,conf} + + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/confuse/confuse-3.3.ebuild b/dev-libs/confuse/confuse-3.3.ebuild index 672a6224ad12..db0ee9ad1df8 100644 --- a/dev-libs/confuse/confuse-3.3.ebuild +++ b/dev-libs/confuse/confuse-3.3.ebuild @@ -1,16 +1,16 @@ -# 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" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="nls static-libs" diff --git a/dev-libs/confuse/files/confuse-3.3-fix-CVE-2022-40320.patch b/dev-libs/confuse/files/confuse-3.3-fix-CVE-2022-40320.patch new file mode 100644 index 000000000000..478c8556fe59 --- /dev/null +++ b/dev-libs/confuse/files/confuse-3.3-fix-CVE-2022-40320.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/901089 +https://github.com/libconfuse/libconfuse/commit/d73777c2c3566fb2647727bb56d9a2295b81669b + +(Rebased by Vaibhav Rustagi <vaibhavrustagi@google.com>) + +From d73777c2c3566fb2647727bb56d9a2295b81669b Mon Sep 17 00:00:00 2001 +From: Joachim Wiberg <troglobit@gmail.com> +Date: Fri, 2 Sep 2022 16:12:46 +0200 +Subject: [PATCH] Fix #163: unterminated username used with getpwnam() + +Signed-off-by: Joachim Wiberg <troglobit@gmail.com> +--- a/src/confuse.c ++++ b/src/confuse.c +@@ -1863,18 +1863,20 @@ DLLIMPORT char *cfg_tilde_expand(const char *filename) + passwd = getpwuid(geteuid()); + file = filename + 1; + } else { +- /* ~user or ~user/path */ +- char *user; ++ char *user; /* ~user or ~user/path */ ++ size_t len; + + file = strchr(filename, '/'); + if (file == 0) + file = filename + strlen(filename); + +- user = malloc(file - filename); ++ len = file - filename - 1; ++ user = malloc(len + 1); + if (!user) + return NULL; + +- strncpy(user, filename + 1, file - filename - 1); ++ strncpy(user, &filename[1], len); ++ user[len] = 0; + passwd = getpwnam(user); + free(user); + } + diff --git a/dev-libs/confuse/metadata.xml b/dev-libs/confuse/metadata.xml index 8fe15be864ee..10287e70c63f 100644 --- a/dev-libs/confuse/metadata.xml +++ b/dev-libs/confuse/metadata.xml @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- 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/cpuinfo/Manifest b/dev-libs/cpuinfo/Manifest index b8493dd5dc07..3dd4455b3d37 100644 --- a/dev-libs/cpuinfo/Manifest +++ b/dev-libs/cpuinfo/Manifest @@ -1 +1,2 @@ DIST cpuinfo-2022.03.26.tar.gz 3503965 BLAKE2B 03607ea04de156907d230dc9f009d72bf6d36ae7391c190c68dbc3f9a4c395e8ec72f935f6ae032d6b1341432278df3aee6f9fe7f7cad1b82784ecec5084d373 SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c +DIST cpuinfo-2022.08.19.tar.gz 3512624 BLAKE2B 909ebde6c522d514641dcbe16586bc972327b8564cb12fa6db25b8978a0a840e627154430f97dd37f024ea4f36a45db8ca5033e6e076390383dd9b35307bed5f SHA512 b3342ce0a1f842084ff53efdfd15c44586ac7cd36249211e2925d84aa1f33ee8d6f76cd62ea20e91d8b908c3c8afda5a47516008b69749504024b9813a623ee2 diff --git a/dev-libs/cpuinfo/cpuinfo-2022.03.26.ebuild b/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild index 28a98cb4ef7f..03c742c31f6d 100644 --- a/dev-libs/cpuinfo/cpuinfo-2022.03.26.ebuild +++ b/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,6 +27,14 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.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 diff --git a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild b/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild new file mode 100644 index 000000000000..83ed0a19815c --- /dev/null +++ b/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild @@ -0,0 +1,44 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +CommitId=8ec7bd91ad0470e61cf38f618cc1f270dede599c + +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" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" + +S="${WORKDIR}"/${PN}-${CommitId} + +PATCHES=( + "${FILESDIR}"/${PN}-2022.03.26-gentoo.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/crc32c/crc32c-1.1.2-r1.ebuild b/dev-libs/crc32c/crc32c-1.1.2-r2.ebuild index dde949144a27..90af416a1a25 100644 --- a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild +++ b/dev-libs/crc32c/crc32c-1.1.2-r2.ebuild @@ -1,7 +1,7 @@ -# 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 cmake @@ -32,6 +32,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 # C++14 or later required for >=gtest-1.13.0 -DCRC32C_BUILD_TESTS=$(usex test) -DCRC32C_BUILD_BENCHMARKS=OFF -DCRC32C_USE_GLOG=OFF diff --git a/dev-libs/crc32c/metadata.xml b/dev-libs/crc32c/metadata.xml index 8b1443351bf8..c0c1de470854 100644 --- a/dev-libs/crc32c/metadata.xml +++ b/dev-libs/crc32c/metadata.xml @@ -5,4 +5,7 @@ <email>arthurzam@gentoo.org</email> <name>Arthur Zamarin</name> </maintainer> + <upstream> + <remote-id type="github">google/crc32c</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/criterion/criterion-2.4.0.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild index d150bad6f79d..49faed7a545b 100644 --- a/dev-libs/criterion/criterion-2.4.0.ebuild +++ b/dev-libs/criterion/criterion-2.4.0.ebuild @@ -3,7 +3,7 @@ EAPI="8" -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-any-r1 diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild index 981964ff1a85..f3384d089938 100644 --- a/dev-libs/criterion/criterion-2.4.1.ebuild +++ b/dev-libs/criterion/criterion-2.4.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-any-r1 diff --git a/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild b/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild index a5fb5914d365..580736e93e7d 100644 --- a/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild +++ b/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/cudnn-frontend/Manifest b/dev-libs/cudnn-frontend/Manifest index 906b7c24a518..c0f25eb32adc 100644 --- a/dev-libs/cudnn-frontend/Manifest +++ b/dev-libs/cudnn-frontend/Manifest @@ -1 +1,2 @@ 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 diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-0.7.3.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-0.7.3.ebuild new file mode 100644 index 000000000000..0ad71cab6763 --- /dev/null +++ b/dev-libs/cudnn-frontend/cudnn-frontend-0.7.3.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/cutlass/Manifest b/dev-libs/cutlass/Manifest new file mode 100644 index 000000000000..5912c749cc75 --- /dev/null +++ b/dev-libs/cutlass/Manifest @@ -0,0 +1 @@ +DIST cutlass-2.10.0.tar.gz 15241458 BLAKE2B 66779759ac1c7ebcb860bb9b925a236b45959f5ee3bf4e1f95ffd05a98200dcf2eb4fe2907c02e44143d3f51eca1e2a4ebd890e0edab7fd5378684819123f197 SHA512 4310f8da2931815a63a5e9a69c6c073f95148efecbea7026afcd90965dbd2e1921db52b0ac2a06cda64e20bbaa44112ae1fb7c3b557c41416d99dac33d000aa7 diff --git a/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild b/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild new file mode 100644 index 000000000000..0a0c63b2dd1c --- /dev/null +++ b/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild @@ -0,0 +1,40 @@ +# 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" + +DEPEND="" +RDEPEND="${DEPEND}" +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 "${D}"/usr/test || die +} diff --git a/dev-libs/cutlass/metadata.xml b/dev-libs/cutlass/metadata.xml new file mode 100644 index 000000000000..851323cabae4 --- /dev/null +++ b/dev-libs/cutlass/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <upstream> + <remote-id type="github">pytorch/pytorch</remote-id> + <remote-id type="github">NVIDIA/cutlass</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/cxxopts/Manifest b/dev-libs/cxxopts/Manifest index 25fc46c0bb8d..443b73a4ee56 100644 --- a/dev-libs/cxxopts/Manifest +++ b/dev-libs/cxxopts/Manifest @@ -1 +1,2 @@ DIST cxxopts-3.0.0.tar.gz 97020 BLAKE2B 129b055dd03ce9e4a146d36587063f7155b47456d81e395ae6eeab8012e8d6cfcb410c305353f2ac2ec66a2f3e8d6169e1a0d27c53dcb35388b967d3c9cc86f1 SHA512 239479a3b35ddef6fc380ac9371e1cf7e3aea066f03e1ea538151fa2fff4296838daa976d55e988d8f87f40c0ae027767bcb214754177499413af1081315565c +DIST cxxopts-3.1.0.tar.gz 101547 BLAKE2B 0e8d17c2f75fbc3326a67c1787eb80177a72e07e79862288498b4bb97a395269a4b14749db4ea14292b77d6b883f8dc9a33a4001c699e53e51b63c7d14e9ece0 SHA512 bfb593f6393160ae3eeff1fe7bc77394606c3af6ae3b785f9740d178514a8fd286556440aa8a2932633f65b6336695fa286d503f3ac544d0f73affd49051e85d diff --git a/dev-libs/cxxopts/cxxopts-3.1.0.ebuild b/dev-libs/cxxopts/cxxopts-3.1.0.ebuild new file mode 100644 index 000000000000..697162ee0804 --- /dev/null +++ b/dev-libs/cxxopts/cxxopts-3.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Lightweight C++ command line option parser" +HOMEPAGE="https://github.com/jarro2783/cxxopts" +SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="icu test" + +RESTRICT="!test? ( test )" + +DOCS=( + README.md + CHANGELOG.md +) + +src_prepare() { + sed -r -e 's:-Werror[[:space:]]*::' -i cmake/cxxopts.cmake || die + cmake_src_prepare +} + +src_configure() { + local -a mycmakeopts=( + -DCXXOPTS_BUILD_EXAMPLES:BOOL=OFF + -DCXXOPTS_BUILD_TESTS:BOOL=$(usex test) + -DCXXOPTS_ENABLE_INSTALL:BOOL=ON + -DCXXOPTS_USE_UNICODE_HELP:BOOL=$(usex icu) + ) + cmake_src_configure +} diff --git a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild index 10143b5f51ad..b87baa58b1ad 100644 --- a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild +++ b/dev-libs/cxxtools/cxxtools-3.0-r2.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 @@ -12,6 +12,8 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="virtual/libiconv" DEPEND="${RDEPEND}" @@ -33,7 +35,16 @@ src_prepare() { src_configure() { econf \ --disable-demos \ - --disable-unittest + $(use_enable test unittest) +} + +src_test() { + emake -C test + + local -x USER=${LOGNAME} + local -x TZ=UTC # doesn't like e.g. :/etc/timezone + cd test || die + ./alltests || die } src_install() { 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 index c5eec79523fc..38733ce427bc 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="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/cyrus-sasl-2.1.28-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild index 9bf5fc8ef2b0..2c1eac083d19 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="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/cyrus-sasl-2.1.28-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild index 380e23c0d641..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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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/darts/darts-0.32h_pre20181117064816.ebuild b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild index 56c5a21c906f..7b61be79be20 100644 --- a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild +++ b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild @@ -25,7 +25,7 @@ fi LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" BDEPEND="" diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild index 39943cb7eb12..75bef2210dfa 100644 --- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild +++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="|| ( GPL-2 AFL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild index 80449ae7b0b4..91f8149a18d4 100644 --- a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild +++ b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="|| ( GPL-2 AFL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/distorm3/distorm3-3.5.2.ebuild b/dev-libs/distorm3/distorm3-3.5.2-r1.ebuild index 50ac20c5ac09..c623afc293d7 100644 --- a/dev-libs/distorm3/distorm3-3.5.2.ebuild +++ b/dev-libs/distorm3/distorm3-3.5.2-r1.ebuild @@ -1,30 +1,34 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) - -inherit distutils-r1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 pypi DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)" HOMEPAGE="http://www.ragestorm.net/distorm/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-4" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" - RESTRICT="!test? ( test )" -DEPEND="" -RDEPEND="" BDEPEND="test? ( dev-lang/yasm )" -distutils_enable_tests pytest +PATCHES=( "${FILESDIR}"/${P}-under.patch ) -PATCHES=("${FILESDIR}"/${P}-under.patch) +EPYTEST_DESELECT=( + # outdated tests? API usage mismatch + # https://github.com/gdabah/distorm/issues/173 + python/test_distorm3.py::Test::test_dummy + python/test_distorm3.py::InstBin::test_dummy + python/test_distorm3.py::Inst::test_dummy +) + +distutils_enable_tests pytest python_install() { distutils-r1_python_install @@ -32,14 +36,3 @@ python_install() { # don't know why it does not happen by default python_optimize } - -python_test() { - local exclude=( - # outdated tests? API udage mismatch - # https://github.com/gdabah/distorm/issues/173 - python/test_distorm3.py::Test::test_dummy - python/test_distorm3.py::InstBin::test_dummy - python/test_distorm3.py::Inst::test_dummy - ) - epytest ${exclude[@]/#/--deselect } -} diff --git a/dev-libs/distorm3/metadata.xml b/dev-libs/distorm3/metadata.xml index 2ce0a2c00b34..228e23190a66 100644 --- a/dev-libs/distorm3/metadata.xml +++ b/dev-libs/distorm3/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="github">gdabah/distorm</remote-id> + <remote-id type="pypi">distorm3</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest index dbfef5c8a9ce..7f512103afb5 100644 --- a/dev-libs/dqlite/Manifest +++ b/dev-libs/dqlite/Manifest @@ -1,2 +1 @@ -DIST dqlite-1.13.0.tar.gz 190627 BLAKE2B 02880a112a7b070ee19653b60f19dbb49030b1d0d1bd3671577137ce281fd1af9c135f138d692fcc1c14592972cc9321198b3a2003fa0e81829c8ae462604964 SHA512 da56c622c75dcdc1df814d2b7acfeb08cb046fa7b74691d63575ddb3d30f91b441b8f58cc72466872b4c5e0028706b6505846d8f3d06583be844baefdd85f8a9 DIST dqlite-1.14.0.tar.gz 190757 BLAKE2B 5304ff10134c7775c4475f77bbe60cc6892cc35c3f2a7b4813743cd27fc1176a1d513d66ebf22b47ed7e83fa833be1408f44f781fbd8200bfd3f4465ea1d6011 SHA512 4305b289903766f00c26e278cce3f761c778b67105a6d7e51e66cc1cbf85564fd41f27689b6895c6f182968d851e10a40d052570d55e22007e9eb5c2929dabd9 diff --git a/dev-libs/dqlite/dqlite-1.13.0.ebuild b/dev-libs/dqlite/dqlite-1.13.0.ebuild deleted file mode 100644 index 5dc934b5faf6..000000000000 --- a/dev-libs/dqlite/dqlite-1.13.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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" -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" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/libuv:= - >=dev-libs/raft-0.16.0" -DEPEND="${RDEPEND} - test? ( >=dev-libs/raft-0.13.0[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 - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/dqlite/dqlite-1.14.0.ebuild b/dev-libs/dqlite/dqlite-1.14.0.ebuild index c0cbc911e373..2c927cf8dd44 100644 --- a/dev-libs/dqlite/dqlite-1.14.0.ebuild +++ b/dev-libs/dqlite/dqlite-1.14.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-3-with-linking-exception" SLOT="0/1.12.0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/efl/efl-1.26.3-r1.ebuild b/dev-libs/efl/efl-1.26.3-r1.ebuild index 8a464db88512..fb26d694f9b3 100644 --- a/dev-libs/efl/efl-1.26.3-r1.ebuild +++ b/dev-libs/efl/efl-1.26.3-r1.ebuild @@ -124,12 +124,17 @@ RDEPEND="${LUA_DEPS} xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )" DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) wayland? ( dev-libs/wayland-protocols )" BDEPEND="${PYTHON_DEPS} virtual/pkgconfig nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner )" +PATCHES=( + "${FILESDIR}"/${PN}-1.26.3-libressl.patch #903001 +) + pkg_setup() { # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV} diff --git a/dev-libs/efl/files/efl-1.26.3-libressl.patch b/dev-libs/efl/files/efl-1.26.3-libressl.patch new file mode 100644 index 000000000000..6bb1b6bb83e3 --- /dev/null +++ b/dev-libs/efl/files/efl-1.26.3-libressl.patch @@ -0,0 +1,191 @@ +https://bugs.gentoo.org/903001 +https://git.enlightenment.org/enlightenment/efl/pulls/10 +https://git.enlightenment.org/enlightenment/efl/commit/bdd5b244e6a6161228f4a98210cefd9ef8a12e85 +https://git.enlightenment.org/enlightenment/efl/commit/0e22417f4579333a967fb5ce65ab339dfc066753 + +From bdd5b244e6a6161228f4a98210cefd9ef8a12e85 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Mon, 4 Jul 2022 09:05:38 -0700 +Subject: [PATCH] Support LibreSSL 3.5.x + +LibreSSL 3.5.x now works with the standard OpenSSL code paths. +--- + src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------ + src/lib/eet/eet_cipher.c | 8 ++++---- + src/lib/emile/emile_cipher_openssl.c | 14 +++++++------- + 3 files changed, 17 insertions(+), 17 deletions(-) + +From 0e22417f4579333a967fb5ce65ab339dfc066753 Mon Sep 17 00:00:00 2001 +From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com> +Date: Mon, 1 Aug 2022 17:35:52 +0100 +Subject: [PATCH] eet emile - cipher - add braces for if defines to be clear on + order of op + +--- + src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------ + src/lib/eet/eet_cipher.c | 8 ++++---- + src/lib/emile/emile_cipher_openssl.c | 10 +++++----- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c +index e59c6811c9..56c8a595eb 100644 +--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c ++++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c +@@ -27,7 +27,7 @@ + static int + efl_net_socket_bio_create(BIO *b) + { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + BIO_set_init(b, 1); + BIO_set_data(b, NULL); + BIO_set_flags(b, 0); +@@ -44,7 +44,7 @@ static int + efl_net_socket_bio_destroy(BIO *b) + { + if (!b) return 0; +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + BIO_set_init(b, 0); + BIO_set_data(b, NULL); + BIO_set_flags(b, 0); +@@ -63,7 +63,7 @@ efl_net_socket_bio_read(BIO *b, char *buf, int len) + .mem = buf, + .len = len + }; +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + Eo *sock = BIO_get_data(b); + #else + Eo *sock = b->ptr; +@@ -99,7 +99,7 @@ efl_net_socket_bio_write(BIO *b, const char *buf, int len) + .mem = buf, + .len = len + }; +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + Eo *sock = BIO_get_data(b); + #else + Eo *sock = b->ptr; +@@ -146,7 +146,7 @@ efl_net_socket_bio_puts(BIO *b, const char *str) + static BIO_METHOD * + __efl_net_socket_bio_get(void) + { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + static BIO_METHOD *efl_net_socket_bio = NULL; + + if (efl_net_socket_bio) return efl_net_socket_bio; +@@ -359,7 +359,7 @@ efl_net_ssl_conn_setup(Efl_Net_Ssl_Conn *conn, Eina_Bool is_dialer, Efl_Net_Sock + conn->bio = BIO_new(__efl_net_socket_bio_get()); + EINA_SAFETY_ON_NULL_GOTO(conn->bio, error_bio); + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + BIO_set_data(conn->bio, sock); + #else + conn->bio->ptr = sock; +diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c +index 025750cc98..30501b99e1 100644 +--- a/src/lib/eet/eet_cipher.c ++++ b/src/lib/eet/eet_cipher.c +@@ -472,7 +472,7 @@ eet_identity_sign(FILE *fp, + gnutls_datum_t signum = { NULL, 0 }; + gnutls_privkey_t privkey; + # else /* ifdef HAVE_GNUTLS */ +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++# if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + EVP_MD_CTX *md_ctx; + # else + EVP_MD_CTX md_ctx; +@@ -562,7 +562,7 @@ eet_identity_sign(FILE *fp, + } + + /* Do the signature. */ +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER))) + md_ctx = EVP_MD_CTX_new(); + if (!md_ctx) + { +@@ -756,7 +756,7 @@ eet_identity_check(const void *data_base, + const unsigned char *tmp; + EVP_PKEY *pkey; + X509 *x509; +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + EVP_MD_CTX *md_ctx; + #else + EVP_MD_CTX md_ctx; +@@ -779,7 +779,7 @@ eet_identity_check(const void *data_base, + } + + /* Verify the signature */ +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + md_ctx = EVP_MD_CTX_new(); + if (!md_ctx) + { +diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c +index e5a1ed4135..7fed417d3f 100644 +--- a/src/lib/emile/emile_cipher_openssl.c ++++ b/src/lib/emile/emile_cipher_openssl.c +@@ -45,12 +45,12 @@ struct _Emile_SSL + Eina_Bool + _emile_cipher_init(void) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL) + ERR_load_crypto_strings(); + SSL_library_init(); + SSL_load_error_strings(); + OpenSSL_add_all_algorithms(); +-#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ ++#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */ + + return EINA_TRUE; + } +@@ -73,7 +73,7 @@ emile_binbuf_sha1(const Eina_Binbuf * data, unsigned char digest[20]) + { + const EVP_MD *md = EVP_sha1(); + Eina_Slice slice = eina_binbuf_slice_get(data); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) + EVP_MD_CTX *ctx = EVP_MD_CTX_new(); + if (!ctx) return EINA_FALSE; + +@@ -196,7 +196,7 @@ on_error: + memset(ik, 0, sizeof (ik)); + + /* Openssl error */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL) + if (ctx) + EVP_CIPHER_CTX_cleanup(ctx); + #else +@@ -204,7 +204,7 @@ on_error: + EVP_CIPHER_CTX_cleanup(ctx); + EVP_CIPHER_CTX_free(ctx); + } +-#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ ++#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */ + + + free(buffer); +@@ -331,7 +331,7 @@ emile_cipher_server_listen(Emile_Cipher_Type t) + SSL_CTX_set_options(r->ssl_ctx, + options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE); + break; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL) + case EMILE_TLSv1: + r->ssl_ctx = SSL_CTX_new(TLSv1_server_method()); + break; +@@ -780,7 +780,7 @@ emile_cipher_server_connect(Emile_Cipher_Type t) + options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE); + break; + case EMILE_TLSv1: +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL) + r->ssl_ctx = SSL_CTX_new(TLSv1_client_method()); + break; + #endif diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index 98e41ab11013..1b799318d833 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -1,3 +1,5 @@ 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 diff --git a/dev-libs/elfutils/elfutils-0.188.ebuild b/dev-libs/elfutils/elfutils-0.188.ebuild index b47d779db744..adfff3be54dc 100644 --- a/dev-libs/elfutils/elfutils-0.188.ebuild +++ b/dev-libs/elfutils/elfutils-0.188.ebuild @@ -15,7 +15,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2. 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 valgrind zstd" +IUSE="bzip2 lzma nls static-libs test +utils zstd" RESTRICT="!test? ( test )" RDEPEND=" @@ -33,7 +33,6 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - valgrind? ( dev-util/valgrind ) " BDEPEND=" >=sys-devel/flex-2.5.4a diff --git a/dev-libs/elfutils/elfutils-0.189-r1.ebuild b/dev-libs/elfutils/elfutils-0.189-r1.ebuild new file mode 100644 index 000000000000..8add6ad1cb00 --- /dev/null +++ b/dev-libs/elfutils/elfutils-0.189-r1.ebuild @@ -0,0 +1,131 @@ +# Copyright 2003-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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" +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}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) + elibc_musl? ( + dev-libs/libbsd + sys-libs/argp-standalone + sys-libs/fts-standalone + sys-libs/obstack-standalone + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + >=sys-devel/flex-2.5.4a + sys-devel/m4 + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-elfutils ) +" + +PATCHES=( + "${WORKDIR}"/${PN}-0.187-patches/ + "${FILESDIR}"/${P}-configure-bashisms.patch + "${FILESDIR}"/${P}-clang16-tests.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 + + if ! use static-libs; then + sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die + fi + + # https://sourceware.org/PR23914 + sed -i 's:-Werror::' */Makefile.in || die +} + +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*' + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable nls) + --disable-debuginfod + --disable-libdebuginfod + + # explicitly disable thread safety, it's not recommended by upstream + # doesn't build either on musl. + --disable-thread-safety + + # Valgrind option is just for running tests under it; dodgy under sandbox + # and indeed even w/ glibc with newer instructions. + --disable-valgrind + --program-prefix="eu-" + --with-zlib + $(use_with bzip2 bzlib) + $(use_with lzma) + $(use_with zstd) + ) + + # Needed because sets alignment macro + is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) + is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ + LC_ALL="C" \ + emake check VERBOSE=1 +} + +multilib_src_install_all() { + einstalldocs + + dodoc NOTES + + # These build quick, and are needed for most tests, so don't + # disable their building when the USE flag is disabled. + if ! use utils; then + rm -rf "${ED}"/usr/bin || die + fi +} diff --git a/dev-libs/elfutils/files/elfutils-0.189-clang16-tests.patch b/dev-libs/elfutils/files/elfutils-0.189-clang16-tests.patch new file mode 100644 index 000000000000..8dede51cbb23 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.189-clang16-tests.patch @@ -0,0 +1,26 @@ +https://sourceware.org/git/?p=elfutils.git;a=commit;h=51373aa9a77ef53d237edc1af664efcbb49f1bf5 + +From 51373aa9a77ef53d237edc1af664efcbb49f1bf5 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Sat, 22 Apr 2023 21:37:09 +0200 +Subject: [PATCH] testsuite: Avoid C99 compatibility issues in + run-native-test.sh + +Include <unistd.h> for the pause function, and add the return type +of main. Avoids an implicit function declaration and implicit int. + +Signed-off-by: Florian Weimer <fweimer@redhat.com> +--- a/tests/run-native-test.sh ++++ b/tests/run-native-test.sh +@@ -27,7 +27,8 @@ + # in all builds. + + tempfiles native.c native +-echo 'main () { while (1) pause (); }' > native.c ++printf '#include <unistd.h>\nint main (void) { while (1) pause (); }\n' \ ++ > native.c + + native=0 + kill_native() +-- +2.31.1 diff --git a/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch b/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch new file mode 100644 index 000000000000..04c01b0ecf88 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch @@ -0,0 +1,49 @@ +https://sourceware.org/git/?p=elfutils.git;a=commit;h=a9834d7df68afde4ee44ee8fef888cf7e799171a + +From a9834d7df68afde4ee44ee8fef888cf7e799171a Mon Sep 17 00:00:00 2001 +From: Mark Wielaard <mark@klomp.org> +Date: Sun, 5 Mar 2023 13:09:34 +0100 +Subject: [PATCH] configure.ac contains Bashisms + +Autoconf scripts are supposed to be written in POSIX-compatible shell +language. elfutils commits 0ffe2874e75d48cb88936e119e5284ff2bf664d9 +and 3fa98a6f29b0f370e32549ead7eb897c839af980 introduced Bashisms to +configure.ac that cause errors when /bin/sh is not Bash. + +Example error when /bin/sh is Dash: + +./configure: 8748: test: xyes: unexpected operator + +The cause of the error is the use of a non-existent == operator in +expressions passed to the 'test' built-in command. POSIX shell +specifies only an = operator for testing string equality. + + * configure.ac: Replace == by = in use_msan and enable_demangler + comparisons. + +https://sourceware.org/bugzilla/show_bug.cgi?id=30196 + +Reported-by: Matt Whitlock <sourceware@mattwhitlock.name> +Signed-off-by: Mark Wielaard <mark@klomp.org> +--- a/configure.ac ++++ b/configure.ac +@@ -169,7 +169,7 @@ if test "$use_msan" = yes; then + CXXFLAGS="$CXXFLAGS -fsanitize=memory -fsanitize-memory-track-origins -D_FORTIFY_SOURCE=0" + LDFLAGS="-shared" + AC_LINK_IFELSE([AC_LANG_SOURCE([int main (int argc, char **argv) { return 0; }])], use_msan=yes, use_msan=no) +- AS_IF([test "x$use_msan" == xyes], ++ AS_IF([test "x$use_msan" = xyes], + ac_cv_zdefs=no NO_UNDEFINED=, + AC_MSG_WARN([clang memory sanitizer not available]) + CFLAGS="$old_CFLAGS" CXXFLAGS="$old_CXXFLAGS") +@@ -493,7 +493,7 @@ AC_ARG_ENABLE([demangler], + AS_HELP_STRING([--disable-demangler], + [Disable libstdc++ demangle support]), + [], [enable_demangler=yes]) +-AS_IF([test "x$enable_demangler" == xyes], ++AS_IF([test "x$enable_demangler" = xyes], + AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl + AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])]) + AM_CONDITIONAL(DEMANGLE, test "x$ac_cv_lib_stdcpp___cxa_demangle" = "xyes") +-- +2.31.1 diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml index d91314ed4c10..1b2b95f274af 100644 --- a/dev-libs/elfutils/metadata.xml +++ b/dev-libs/elfutils/metadata.xml @@ -8,7 +8,6 @@ <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="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></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 543e3cec81de..9d589fc7ddad 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -1,3 +1,2 @@ -DIST ell-0.54.tar.xz 562496 BLAKE2B d5aa705d0a72068c18b4f7f2b40c80069fc4d8a746a4c8585140da5387e06a529019b4e8eb37d4caeb9fbb948100e86f78d678ca3a3c0964d03ec368f7a4be64 SHA512 dff507ced951a4919f6fe82b276446ee6a9bfb0b3b9fe7abb2c76a3c22cdccf92f97ebcb0a476946adef5b031fd0d86f5af934b052383bdd87b5a7962b021bac -DIST ell-0.55.tar.xz 562716 BLAKE2B b49acda837e22dec8469423dd47b397471975acdb0df034f0d85163daf0eb393b9bb75b1dd81c6e8a395e271bb0b8da01939df3497983aae5b6d270a70dcd5fc SHA512 f71b7d20a37009842ae54b72463e4c34509d00f0c344ae3b39acabe784fee83027d04b3f272f51dbc519f82ab794837b9a24ca90da55b97c757725d030c1874e DIST ell-0.56.tar.xz 563096 BLAKE2B 3be874ddddab558911d5ea4e4fb0b32c1557b8577435f39ee88d7302bbb0efbd24671f6c426bbeaba2704ba45b865320e6f2e31f6a9c4d86e82dc8ed38ebae9f SHA512 7255470331927f67ebd1297e6c524c9c244234cf00923016c77d90bad5e4e381605c70373a7be4ecf9c1e72ec85fbc1671960dd31fb6eec279f2299e81c66ac1 +DIST ell-0.57.tar.xz 563996 BLAKE2B 6fec30dc6994656b4a266cddaaf5984c3bcdb06b8b80d432b772f5c2a3166f2f3a4dca7ce1d44857901150a17f17be595606e535ef4ca0cb97476effbb6342cc SHA512 6dd6dea39b835550a4d4fd4ca1ec98c50842eb557d5f55d3a8f8d566f7b8ea3a4473135101860b4d8decfc4d24f55ff5e389ac95d1d309d5504b632cf80c975e diff --git a/dev-libs/ell/ell-0.54.ebuild b/dev-libs/ell/ell-0.54.ebuild deleted file mode 100644 index 6ab0c68ddaec..000000000000 --- a/dev-libs/ell/ell-0.54.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 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://01.org/ell" -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.56.ebuild b/dev-libs/ell/ell-0.56.ebuild index 5e79649bd337..c8a82a95915c 100644 --- a/dev-libs/ell/ell-0.56.ebuild +++ b/dev-libs/ell/ell-0.56.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/ell/ell-0.55.ebuild b/dev-libs/ell/ell-0.57.ebuild index a865da2e6d3f..5e79649bd337 100644 --- a/dev-libs/ell/ell-0.55.ebuild +++ b/dev-libs/ell/ell-0.57.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/expat/expat-2.5.0.ebuild b/dev-libs/expat/expat-2.5.0.ebuild index 284d45d381c1..16e5df511891 100644 --- a/dev-libs/expat/expat-2.5.0.ebuild +++ b/dev-libs/expat/expat-2.5.0.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 @@ -12,8 +12,9 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="examples static-libs unicode" +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="examples static-libs test unicode" +RESTRICT="!test? ( test )" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" DOCS=( README.md ) @@ -37,7 +38,7 @@ src_prepare() { } multilib_src_configure() { - local myconf="$(use_enable static-libs static) --without-docbook" + local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook" mkdir -p "${BUILD_DIR}"w || die diff --git a/dev-libs/ffcall/ffcall-2.4-r1.ebuild b/dev-libs/ffcall/ffcall-2.4-r1.ebuild index 370cad023a20..cd0ba85f08fd 100644 --- a/dev-libs/ffcall/ffcall-2.4-r1.ebuild +++ b/dev-libs/ffcall/ffcall-2.4-r1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV} # under GNU LGPL." -ffcall author LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" PATCHES=( # bug 842915, drop on next version bump diff --git a/dev-libs/ffcall/ffcall-2.4.ebuild b/dev-libs/ffcall/ffcall-2.4.ebuild index 286058bbcc34..1b41ad034e33 100644 --- a/dev-libs/ffcall/ffcall-2.4.ebuild +++ b/dev-libs/ffcall/ffcall-2.4.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV} # under GNU LGPL." -ffcall author LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" PATCHES=( # bug 842915, drop on next version bump diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest index 87667c2f6406..939cb14a6d29 100644 --- a/dev-libs/flatbuffers/Manifest +++ b/dev-libs/flatbuffers/Manifest @@ -1,4 +1,2 @@ -DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6 -DIST flatbuffers-22.12.06.gh.tar.gz 2172096 BLAKE2B 92bf0c56c10fa369e7a8a53a7f903af6b5f17560a3558587914c29ab8a655f3ee078c3e261426ca5d9ad0587419d4f0049459edc552e25958f80b80ba9539d59 SHA512 1b2c8eaa2ebeb92c3ebc363888b34b817d7b62a568e40bce2b037814f1f0103d4cb7db8507ec9ca05421be61b0b2be3edd6c4d564f75d1ce39278d73f8442ac1 -DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b86cebb6d6a4058bb6d593de81bf3c32ddfb9fd475e4bb225d4529ea106253456a5ed1ee6d024b1e2521e02efef171750f428 SHA512 fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f -DIST flatbuffers-23.1.4.gh.tar.gz 2178791 BLAKE2B 8c354c539378f7d8e05307f7ba0f5393265a6183fc8868d48b8da5ab7d39a3e7a7f85631db00f0dc57bf396d20652049303a79fbf31f07639d80596d300a7701 SHA512 8b3e1b9596a76548faca529fe5070e775be50bfdea079ba4f66014f5a1bfb93f8edd7e56f97363c897d2db8391277a9099a61d14e4298c3669ab7068bbf07865 +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/files/flatbuffers-2.0.6-locales-detection-fixup.patch b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch deleted file mode 100644 index 6ab1b085876c..000000000000 --- a/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f10f1fdeab9dedf8206965b73a52e02e3de3bc41 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anarchy@gentoo.org> -Date: Wed, 22 Jun 2022 13:09:43 -0500 -Subject: [PATCH] Fix base.h to only include locale support for glibc users - -Signed-off-by: Jory Pratt <anarchy@gentoo.org> ---- - include/flatbuffers/base.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h -index 458ac3f..46d6d80 100644 ---- a/include/flatbuffers/base.h -+++ b/include/flatbuffers/base.h -@@ -262,7 +262,7 @@ namespace flatbuffers { - #ifndef FLATBUFFERS_LOCALE_INDEPENDENT - // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}. - #if ((defined(_MSC_VER) && _MSC_VER >= 1800) || \ -- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) -+ (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) - #define FLATBUFFERS_LOCALE_INDEPENDENT 1 - #else - #define FLATBUFFERS_LOCALE_INDEPENDENT 0 --- -2.35.1 - diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild deleted file mode 100644 index 4fd61a266b9f..000000000000 --- a/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Memory efficient serialization library" -HOMEPAGE="https://google.github.io/flatbuffers/" -SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -# From 1.2.0->2.0.0, incremented SONAME, although the interface didn't actually change. -# (Apparently to adopt semver.) -SLOT="0/2" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" -IUSE="static-libs test" - -# out-of-source build broken, bug #842060 -RESTRICT="test !test? ( test )" - -DOCS=( readme.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.6-locales-detection-fixup.patch -) - -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-22.12.06.ebuild b/dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild deleted file mode 100644 index d20c1234354b..000000000000 --- a/dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Memory efficient serialization library" -HOMEPAGE=" - https://google.github.io/flatbuffers/ - 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/2" -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.1.4.ebuild b/dev-libs/flatbuffers/flatbuffers-23.3.3.ebuild index fe724780b7de..5634974fa530 100644 --- a/dev-libs/flatbuffers/flatbuffers-23.1.4.ebuild +++ b/dev-libs/flatbuffers/flatbuffers-23.3.3.ebuild @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="Memory efficient serialization library" HOMEPAGE=" - https://google.github.io/flatbuffers/ + https://flatbuffers.dev/ https://github.com/google/flatbuffers/ " SRC_URI=" @@ -16,8 +16,8 @@ SRC_URI=" " LICENSE="Apache-2.0" -SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm arm64 ~riscv x86" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild b/dev-libs/flatbuffers/flatbuffers-23.5.26.ebuild index 7b43c4bca4fb..c8139e30f141 100644 --- a/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild +++ b/dev-libs/flatbuffers/flatbuffers-23.5.26.ebuild @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="Memory efficient serialization library" HOMEPAGE=" - https://google.github.io/flatbuffers/ + https://flatbuffers.dev/ https://github.com/google/flatbuffers/ " SRC_URI=" @@ -21,8 +21,6 @@ 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) diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest index 5483c6d39711..74f84e9500ed 100644 --- a/dev-libs/folks/Manifest +++ b/dev-libs/folks/Manifest @@ -1 +1 @@ -DIST folks-0.15.5.tar.xz 492976 BLAKE2B bb831a637dec44ba0e9bb815c2559e3b7f484734fc297293c392bb2c72dea77c5e8aec3e7c76a096288f84f463041fb0b52a3cb50a83c5d84bed818c6af72a27 SHA512 696d158234cc5b4c504491c6e01dc45ed53c4ac02e3e62e637d229207dde396a82a850d143d8615dc838d99c756edfce145405ea3972c556951d6408fb8487ea +DIST folks-0.15.6.tar.xz 497968 BLAKE2B bb9237fae05a748a18a85d29034e879947c4ffcc1d3dbe7277c8e1f41e6e9c9ec27170e9e7d2ccb6dcc89789d331f7f320648620636e1ee54685906fc67ba4f9 SHA512 8d77c3b4c963d88877798b24da9edd977b3ac4b18568ed75885fa87bf81e0e8f29dc8232352e3fefc0bf2c9bb8ca6cea984d87d946a3892963a158bd4f45dc30 diff --git a/dev-libs/folks/folks-0.15.5.ebuild b/dev-libs/folks/folks-0.15.6.ebuild index 36c177483257..36c177483257 100644 --- a/dev-libs/folks/folks-0.15.5.ebuild +++ b/dev-libs/folks/folks-0.15.6.ebuild diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest index d9274684e598..04aa3f3c0435 100644 --- a/dev-libs/fribidi/Manifest +++ b/dev-libs/fribidi/Manifest @@ -1 +1,2 @@ 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 index b85a0deb64f0..21e1a4e95aa4 100644 --- a/dev-libs/fribidi/fribidi-1.0.12.ebuild +++ b/dev-libs/fribidi/fribidi-1.0.12.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/fribidi/fribidi-1.0.13.ebuild b/dev-libs/fribidi/fribidi-1.0.13.ebuild new file mode 100644 index 000000000000..41c1b0955fff --- /dev/null +++ b/dev-libs/fribidi/fribidi-1.0.13.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 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 ~arm64-macos ~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/gf2x/gf2x-1.3.0-r1.ebuild b/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild index bb6abab0ffb6..17847f27665f 100644 --- a/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild +++ b/dev-libs/gf2x/gf2x-1.3.0-r1.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 @@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/38243/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/3" # soname major version, defined in configure.ac -KEYWORDS="amd64 ~arm64 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/Manifest b/dev-libs/girara/Manifest index 250b7af5a3cf..1df2222c4687 100644 --- a/dev-libs/girara/Manifest +++ b/dev-libs/girara/Manifest @@ -1,4 +1,2 @@ -DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84 -DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42 -DIST girara-0.3.7.tar.xz 60352 BLAKE2B 59515baf53d3ef46d98d5720437c253c82637df8380abe04a1649d4a2636124d6d0dfb001c9363d8a33a1bc496511e90b8c5365db34a29d489802fc780575d2a SHA512 9b91ef7e5047b3250327eab9280372f38615e9948884c108c3d1c5d3e81794f786adc827692b112d2bfdc2660e22206a143fafd5a814408df8ffd4c858148717 DIST girara-0.3.9.tar.xz 60832 BLAKE2B e577c4273c2d8f4d51e0ee283184ecd2b5b48877996f95aa5cec83ad716efd4946508203d3108d451492ff5d118d965ca98d86f4e0d9b31fcc1cc0b2266b9511 SHA512 b5399b26389cff0c6aa6f70687b53a99243d38d66ec401f48de49391c88b31dc3287366819288c405051d14f4f778db952953d48be51ac47d90d9f3604c94708 +DIST girara-0.4.0.tar.xz 60804 BLAKE2B 4653986945b89c87c597f20425c0009473679578b9a92fd3f4480aa2decc5dcbb2c1a2b0db07bef67c818c2e2940b6c363da0020fa24e7001be13cb68e2ba945 SHA512 a8753231cb9de7d60ddaf6e7b19537f23ce447be5885725c982e395068466089fca46980d413cc4ea8e4a8059ccd4615366297600bcf7ef5bddf02d649703dec diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild deleted file mode 100644 index 67aab558816f..000000000000 --- a/dev-libs/girara/girara-0.3.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson virtualx - -DESCRIPTION="UI library that focuses on simplicity and minimalism" -HOMEPAGE="https://pwmt.org/projects/girara/" - -if [[ ${PV} == *999 ]]; 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="dev-libs/glib:2 - dev-libs/json-c:= - >=x11-libs/gtk+-3.20:3 - libnotify? ( x11-libs/libnotify )" -RDEPEND="${DEPEND}" -BDEPEND="doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) - virtual/pkgconfig" - -src_configure() { - local emesonargs=( - -Djson=enabled - -Ddocs=$(usex doc enabled disabled) - -Dnotify=$(usex libnotify enabled disabled) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/girara/girara-0.3.6.ebuild b/dev-libs/girara/girara-0.3.6.ebuild deleted file mode 100644 index 67aab558816f..000000000000 --- a/dev-libs/girara/girara-0.3.6.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson virtualx - -DESCRIPTION="UI library that focuses on simplicity and minimalism" -HOMEPAGE="https://pwmt.org/projects/girara/" - -if [[ ${PV} == *999 ]]; 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="dev-libs/glib:2 - dev-libs/json-c:= - >=x11-libs/gtk+-3.20:3 - libnotify? ( x11-libs/libnotify )" -RDEPEND="${DEPEND}" -BDEPEND="doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) - virtual/pkgconfig" - -src_configure() { - local emesonargs=( - -Djson=enabled - -Ddocs=$(usex doc enabled disabled) - -Dnotify=$(usex libnotify enabled disabled) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/girara/girara-0.3.9.ebuild b/dev-libs/girara/girara-0.3.9.ebuild index 88dc773e88de..0bbc7c6f02e7 100644 --- a/dev-libs/girara/girara-0.3.9.ebuild +++ b/dev-libs/girara/girara-0.3.9.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 @@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then EGIT_BRANCH="develop" else SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~riscv ~x86" + KEYWORDS="amd64 arm ~riscv x86" fi LICENSE="ZLIB" diff --git a/dev-libs/girara/girara-0.3.7.ebuild b/dev-libs/girara/girara-0.4.0.ebuild index 7d10e474a577..0bbc7c6f02e7 100644 --- a/dev-libs/girara/girara-0.3.7.ebuild +++ b/dev-libs/girara/girara-0.4.0.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 @@ -24,7 +24,7 @@ IUSE="doc libnotify test" RESTRICT="!test? ( test )" DEPEND="dev-libs/glib:2 - dev-libs/json-c:= + dev-libs/json-glib:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )" RDEPEND="${DEPEND}" diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 5ffaae812bbb..f6dbe776d33d 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1 +1 @@ -DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614 +DIST gjs-1.76.0.tar.xz 645364 BLAKE2B 9987033883e466c983af007c870cba4f2ef70ee08e276777e1b52103ddcebd1285ca9f3ce64c8ef52437a829157f58902cfb921eed06442e53fd9778d9cd9f2b SHA512 fa44431f431f14b82c648c388046b83722808db52d2bbe2deeb8d270d6fbeee9c4ee27feaa4fef425e1ab5ac65a1e68d7aa9457d543044362752810128064ea6 diff --git a/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch b/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch new file mode 100644 index 000000000000..2bb80126507f --- /dev/null +++ b/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch @@ -0,0 +1,38 @@ +# https://gitlab.gnome.org/GNOME/gjs/-/issues/532 +# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/830/diffs?commit_id=83683d093c157828cf7787e53a32c586ae4e85d3 +diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build +index 6db887d2250face397079b03d215bbd13f455efb..1e953ceb7695356b6e854775e5db005a9c22e053 100644 +--- a/installed-tests/js/meson.build ++++ b/installed-tests/js/meson.build +@@ -203,9 +203,13 @@ endif + # during build should be run using dbus-run-session + + dbus_tests = ['GDBus'] +-if have_gtk4 and not get_option('skip_gtk_tests') +- # FIXME: find out why GTK4 tries to acquire a message bus +- dbus_tests += 'Gtk4' ++if not get_option('skip_gtk_tests') ++ have_gtk4 = dependency('gtk4', required: false).found() ++ ++ if have_gtk4 ++ # FIXME: find out why GTK4 tries to acquire a message bus ++ dbus_tests += 'Gtk4' ++ endif + endif + + bus_config = files('../../test/test-bus.conf') +diff --git a/meson.build b/meson.build +index 3ac372a16b0bfaa364ed7422119f3e6e4af8971e..5c7703935b68c724347692ef5bf47a3edf868c61 100644 +--- a/meson.build ++++ b/meson.build +@@ -679,10 +679,6 @@ endif + + ### Tests and test setups ###################################################### + +-if not get_option('skip_gtk_tests') +- have_gtk4 = dependency('gtk4', required: false).found() +-endif +- + subdir('installed-tests') + + # Note: The test program in test/ needs to be ported diff --git a/dev-libs/gjs/gjs-1.74.1.ebuild b/dev-libs/gjs/gjs-1.76.0.ebuild index cc5a3f3cb136..510b1bfe27b3 100644 --- a/dev-libs/gjs/gjs-1.74.1.ebuild +++ b/dev-libs/gjs/gjs-1.76.0.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 @@ -17,7 +17,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.66.0:2 dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.66.1:= + >=dev-libs/gobject-introspection-1.71.1:= >=dev-lang/spidermonkey-102.2.0:102 cairo? ( x11-libs/cairo[X,glib] ) readline? ( sys-libs/readline:0= ) @@ -33,6 +33,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${P}-move_have_gtk4_to_the_appropriate_place.patch" +) + src_configure() { append-cppflags -DG_DISABLE_CAST_CHECKS diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index d99cd57cc034..8ad462b9a26f 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,4 +1,2 @@ -DIST glib-2.74.3-patches-2.tar.xz 23576 BLAKE2B f3746bdf961890d9f4e7ad20b107b83b7ceb8dcc36e288c1d526bac31a0e1dd9d1f13323f512355085c77d186ad66c3f52c1154f34c1d6fd6a5e64a074b2920c SHA512 945c131c27f02044db6154f0a63f458d6317c8a4e841fb392947b16756e25d92adeb2b34d793c9e19441b825d1aee71ae9b08fdcbefa1bc9de1d5af9e903e82c -DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b -DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6 -DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614 +DIST glib-2.76.2.tar.xz 5273836 BLAKE2B db5d5e45fe4a17bade7f5bf923ac0e5541237d19146ede33b4d52f05b82e4ecb94519393f49ac3b04e17d0f56bfd5dd99b8e81ae80956cfdb5cb2396cd5ec8cc SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6 +DIST glib-2.76.3.tar.xz 5273460 BLAKE2B 894635281d1a3eb60d274b8db91cd59069b6d0abe61295175c794ad44e8669d869009fac44c7d6f416a93adcea5b9aeb90b944047d013fa1f2d9b1a8ded3de1e SHA512 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e diff --git a/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch b/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch deleted file mode 100644 index 9cd48a26453e..000000000000 --- a/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3165 - -From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@redhat.com> -Date: Tue, 20 Dec 2022 17:10:41 -0600 -Subject: [PATCH] gthread-posix: need to #include <errno.h> - -a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required -header. - - -(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd) ---- a/glib/gthreadprivate.h -+++ b/glib/gthreadprivate.h -@@ -41,6 +41,7 @@ struct _GRealThread - /* system thread implementation (gthread-posix.c, gthread-win32.c) */ - - #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64) -+#include <errno.h> - #include <linux/futex.h> - #include <sys/syscall.h> - #include <unistd.h> --- -GitLab diff --git a/dev-libs/glib/glib-2.74.3-r3.ebuild b/dev-libs/glib/glib-2.74.3-r3.ebuild deleted file mode 100644 index d97da8c4c903..000000000000 --- a/dev-libs/glib/glib-2.74.3-r3.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# 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_{9..11} ) - -inherit flag-o-matic 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/" -# https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835 -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-2.tar.xz" - -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" - -# * 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 - "${WORKDIR}"/${P}-patches-2 -) - -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 - - default - gnome2_environment_reset - # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only -} - -multilib_src_configure() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - - # 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=( - -Ddefault_library=$(usex static-libs both shared) - $(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/glib/glib-2.74.4.ebuild b/dev-libs/glib/glib-2.76.2.ebuild index 9d4a61eeb1c9..2741ab50f0df 100644 --- a/dev-libs/glib/glib-2.74.4.ebuild +++ b/dev-libs/glib/glib-2.76.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" PYTHON_COMPAT=( python3_{9..11} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg +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/" @@ -14,9 +14,9 @@ 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 +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" +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 @@ -69,7 +69,6 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch - "${FILESDIR}"/${P}-implicit-func-decl.patch ) pkg_setup() { @@ -136,18 +135,36 @@ src_prepare() { 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() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - # 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 @@ -159,7 +176,9 @@ multilib_src_configure() { #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' diff --git a/dev-libs/glib/glib-2.74.5.ebuild b/dev-libs/glib/glib-2.76.3.ebuild index 7924f656d5e2..d25af8f101dc 100644 --- a/dev-libs/glib/glib-2.74.5.ebuild +++ b/dev-libs/glib/glib-2.76.3.ebuild @@ -3,9 +3,9 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg +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/" @@ -14,9 +14,9 @@ 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 +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" +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 @@ -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 @@ -135,22 +136,42 @@ src_prepare() { 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() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - - # 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 ;; @@ -158,7 +179,9 @@ multilib_src_configure() { #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' @@ -204,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/gmime/gmime-2.6.23-r2.ebuild b/dev-libs/gmime/gmime-2.6.23-r2.ebuild index 4bf6d80f39bf..60b674958ab5 100644 --- a/dev-libs/gmime/gmime-2.6.23-r2.ebuild +++ b/dev-libs/gmime/gmime-2.6.23-r2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/" LICENSE="LGPL-2.1" SLOT="2.6" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="doc smime test vala" RESTRICT="!test? ( test )" diff --git a/dev-libs/gmime/gmime-3.2.13.ebuild b/dev-libs/gmime/gmime-3.2.13.ebuild index 9dbe0d5adc7f..fa8d03b5bbaa 100644 --- a/dev-libs/gmime/gmime-3.2.13.ebuild +++ b/dev-libs/gmime/gmime-3.2.13.ebuild @@ -11,7 +11,7 @@ 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 ~x86-solaris" +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 )" diff --git a/dev-libs/gmp/gmp-6.2.1-r2.ebuild b/dev-libs/gmp/gmp-6.2.1-r2.ebuild index ae2140240b2a..7f25f4bab2a8 100644 --- a/dev-libs/gmp/gmp-6.2.1-r2.ebuild +++ b/dev-libs/gmp/gmp-6.2.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit libtool multilib-minimal toolchain-funcs +inherit libtool flag-o-matic multilib-minimal toolchain-funcs MY_PV=${PV/_p*} MY_PV=${MY_PV/_/-} @@ -23,7 +23,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-da 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="+asm doc +cxx pic static-libs" BDEPEND="sys-devel/m4 @@ -66,6 +66,11 @@ src_prepare() { } 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 diff --git a/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/dev-libs/gmp/gmp-6.2.1-r5.ebuild index be3203afdc82..288f625d457f 100644 --- a/dev-libs/gmp/gmp-6.2.1-r5.ebuild +++ b/dev-libs/gmp/gmp-6.2.1-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit gnuconfig libtool multilib-minimal toolchain-funcs +inherit gnuconfig libtool flag-o-matic multilib-minimal toolchain-funcs MY_PV=${PV/_p*} MY_PV=${MY_PV/_/-} @@ -27,7 +27,7 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="+asm doc +cpudetection +cxx pic static-libs" REQUIRED_USE="cpudetection? ( asm )" RESTRICT="!cpudetection? ( bindist )" @@ -94,6 +94,11 @@ src_prepare() { } 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 diff --git a/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild b/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild index cd8850df2d95..304883cf516e 100644 --- a/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild +++ b/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild @@ -9,9 +9,9 @@ DESCRIPTION="Library of common routines intended to be shared" HOMEPAGE="https://www.gnu.org/software/gnulib" SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-3+ LGPL-2.1+ FDL-1.3+" SLOT="0" -KEYWORDS="~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-macos ~x64-solaris" IUSE="doc" S="${WORKDIR}/${PN}-${GIT_TAG}" 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 64e187b2477d..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 @@ -9,9 +9,9 @@ DESCRIPTION="Library of common routines intended to be shared" HOMEPAGE="https://www.gnu.org/software/gnulib" SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-3+ LGPL-2.1+ FDL-1.3+" SLOT="0" -KEYWORDS="~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris" IUSE="doc" S="${WORKDIR}/${PN}-${GIT_TAG}" diff --git a/dev-libs/gnulib/gnulib-9999-r1.ebuild b/dev-libs/gnulib/gnulib-9999-r1.ebuild index 7305188a7c64..10bc9a526f5a 100644 --- a/dev-libs/gnulib/gnulib-9999-r1.ebuild +++ b/dev-libs/gnulib/gnulib-9999-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Gnulib is a library of common routines intended to be shared at the HOMEPAGE="https://www.gnu.org/software/gnulib" EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" -LICENSE="GPL-2" +LICENSE="GPL-3+ LGPL-2.1+ FDL-1.3+" SLOT="0" KEYWORDS="" IUSE="doc" diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest index baaf52d4a791..2d9f357291f1 100644 --- a/dev-libs/gobject-introspection-common/Manifest +++ b/dev-libs/gobject-introspection-common/Manifest @@ -1 +1 @@ -DIST gobject-introspection-1.74.0.tar.xz 1044008 BLAKE2B 223bb9b8b452f03945f941086e47fb3b14f03f8353f4f903b21e3f494af728652a44de986752374057e90dd8111f21f5b0cd3e00bb0a8c3aa25c8261bb0b9247 SHA512 decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0 +DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916 diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.74.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild index 6e70bb93ebba..cf04ae5c7db0 100644 --- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.74.0.ebuild +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.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 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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/Manifest b/dev-libs/gobject-introspection/Manifest index baaf52d4a791..2d9f357291f1 100644 --- a/dev-libs/gobject-introspection/Manifest +++ b/dev-libs/gobject-introspection/Manifest @@ -1 +1 @@ -DIST gobject-introspection-1.74.0.tar.xz 1044008 BLAKE2B 223bb9b8b452f03945f941086e47fb3b14f03f8353f4f903b21e3f494af728652a44de986752374057e90dd8111f21f5b0cd3e00bb0a8c3aa25c8261bb0b9247 SHA512 decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0 +DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916 diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild index 592e42c16091..256ebb39ff23 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild @@ -15,12 +15,12 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" >=dev-libs/gobject-introspection-common-${PV} - >=dev-libs/glib-2.74.0:2 + >=dev-libs/glib-2.75.0:2 dev-libs/libffi:= doctool? ( $(python_gen_cond_dep ' diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild index 8586d3a3c1bf..dbc4061299ce 100644 --- a/dev-libs/gumbo/gumbo-0.10.1.ebuild +++ b/dev-libs/gumbo/gumbo-0.10.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=7 @@ -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 x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest index e56d2c6315f8..171a4ffec6a0 100644 --- a/dev-libs/hiredis/Manifest +++ b/dev-libs/hiredis/Manifest @@ -1,3 +1,2 @@ -DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f DIST hiredis-1.0.2.tar.gz 98139 BLAKE2B 86d872cfec3d4e925d5d68e4f4faf1301aa6d706bd0406a8080471e14afc2c25db13b9a0937d29baccd457611af8e46922b5379183c7470c9ae1860aac3af096 SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b DIST hiredis-1.1.0.tar.gz 122002 BLAKE2B 74c23816e59ea241c68640f99970ae68536a1cd605ac1a7146bf52e355f5f74b3d39fb81be02741cf776c06b47b9d5acc7ec66bfdcf802dec3ed68fb28a82b1b SHA512 9dad012c144ed24de6aa413a3a10d19a9d0d9ece18dbc388406cd86c5b98cb66c76c586cb559c601ed13a75051d8921dc2882534cc3605513fde47d57276c3bb diff --git a/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch deleted file mode 100644 index 000e2537b5a0..000000000000 --- a/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git test.c test.c -index 8fde554..89ed6a0 100644 ---- a/test.c -+++ b/test.c -@@ -343,6 +343,7 @@ static void test_free_null(void) { - static void test_blocking_connection_errors(void) { - redisContext *c; - -+#if 0 - test("Returns error when host cannot be resolved: "); - c = redisConnect((char*)"idontexist.test", 6379); - test_cond(c->err == REDIS_ERR_OTHER && -@@ -353,6 +354,7 @@ static void test_blocking_connection_errors(void) { - strcmp(c->errstr,"Temporary failure in name resolution") == 0 || - strcmp(c->errstr,"no address associated with name") == 0)); - redisFree(c); -+#endif - - test("Returns error when the port is not open: "); - c = redisConnect((char*)"localhost", 1); -@@ -773,6 +775,7 @@ int main(int argc, char **argv) { - test_blocking_connection_errors(); - test_free_null(); - -+#if 0 - printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port); - cfg.type = CONN_TCP; - test_blocking_connection(cfg); -@@ -781,6 +784,7 @@ int main(int argc, char **argv) { - test_invalid_timeout_errors(cfg); - test_append_formatted_commands(cfg); - if (throughput) test_throughput(cfg); -+#endif - - printf("\nTesting against Unix socket connection (%s):\n", cfg.unix.path); - cfg.type = CONN_UNIX; diff --git a/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch b/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch deleted file mode 100644 index 0bfcf0988e81..000000000000 --- a/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -51,7 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR) - DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) - DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) - STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) --STLIB_MAKE_CMD=ar rcs $(STLIBNAME) -+STLIB_MAKE_CMD=$(AR) rcs $(STLIBNAME) - - # Platform-specific overrides - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild deleted file mode 100644 index 8711e421b030..000000000000 --- a/dev-libs/hiredis/hiredis-0.14.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Minimalistic C client library for the Redis database" -HOMEPAGE="https://github.com/redis/hiredis" -SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/0.14" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris" -IUSE="examples static-libs test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-db/redis )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.13.3-disable-network-tests.patch - "${FILESDIR}"/${PN}-0.14.1-honor-AR.patch -) - -src_prepare() { - default - - # use GNU ld syntax on Solaris - sed -i -e '/DYLIB_MAKE_CMD=.* -G/d' Makefile || die -} - -_build() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - PREFIX="${EPREFIX}/usr" \ - LIBRARY_PATH="$(get_libdir)" \ - DEBUG_FLAGS= \ - OPTIMIZATION= \ - "$@" -} - -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 -} - -src_test() { - local REDIS_PID="${T}"/hiredis.pid - local REDIS_SOCK="${T}"/hiredis.sock - local REDIS_PORT=56379 - local REDIS_TEST_CONFIG="daemonize yes - pidfile ${REDIS_PID} - port ${REDIS_PORT} - bind 127.0.0.1 - unixsocket //${REDIS_SOCK}" - - _build hiredis-test - - "${EPREFIX}"/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die - ./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK} - local ret=$? - - kill "$(<"${REDIS_PID}")" || die - [[ ${ret} != "0" ]] && die "tests failed" -} - -src_install() { - _build PREFIX="${ED}/usr" install - - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi - - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc - - local DOCS=( CHANGELOG.md README.md ) - use examples && DOCS+=( examples ) - einstalldocs -} diff --git a/dev-libs/hiredis/hiredis-1.1.0.ebuild b/dev-libs/hiredis/hiredis-1.1.0.ebuild index 04945ae5a369..4d173dd34c4d 100644 --- a/dev-libs/hiredis/hiredis-1.1.0.ebuild +++ b/dev-libs/hiredis/hiredis-1.1.0.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 @@ -13,7 +13,7 @@ LICENSE="BSD" # Always check "Upgrading from ..." in README # e.g. https://github.com/redis/hiredis#upgrading-to-110 SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-solaris" IUSE="examples ssl static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest index 583b450ea304..92924af20c50 100644 --- a/dev-libs/hyperscan/Manifest +++ b/dev-libs/hyperscan/Manifest @@ -1 +1 @@ -DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62 +DIST hyperscan-5.4.2.tar.gz 1848851 BLAKE2B a4539df7c6a4b5f097effa67bc777c37ff02aae356953acd4ffe871f621c556f6357c37ad813db144ed50af21881838946b7cb5ef9ea345412de908b84497dac SHA512 328f21133161d16b36ebdc7f8b80a7afe7ca9e7e7433348e9bfa9acb5f3641522e8314beea1b219891f4e95f1392ff8036ebb87780fe808b8b4bd15a535e9509 diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.2.ebuild index 34d42c4677bb..c82f020ea277 100644 --- a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild +++ b/dev-libs/hyperscan/hyperscan-5.4.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) @@ -9,12 +9,15 @@ inherit cmake flag-o-matic python-any-r1 DESCRIPTION="High-performance regular expression matching library" SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan" +HOMEPAGE=" + https://www.hyperscan.io/ + https://github.com/intel/hyperscan +" LICENSE="BSD" SLOT="0" KEYWORDS="-* amd64 x86" -IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3 static-libs" +IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3" RDEPEND="dev-libs/boost:=" DEPEND="${RDEPEND}" @@ -40,12 +43,9 @@ src_configure() { use cpu_flags_x86_ssse3 && append-flags -mssse3 use cpu_flags_x86_avx2 && append-flags -mavx2 - # Temporary, see #772086#c1 and associated PR - CMAKE_BUILD_TYPE="Release" - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) - -DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF) + -DBUILD_SHARED_LIBS=ON + -DBUILD_STATIC_AND_SHARED=OFF -DBUILD_EXAMPLES=OFF -DFAT_RUNTIME=false ) @@ -55,3 +55,11 @@ src_configure() { src_test() { "${BUILD_DIR}"/bin/unit-hyperscan || die } + +pkg_postinst() { + if has_version '<mail-filter/rspamd-3.5'; then + elog "There is known issue with <mail-filter/rspamd-3.5 when hyperscan version changes." + elog "Known workaround is to remove hyperscan databases ${EROOT}/var/lib/rspamd/*.hs*" + elog "See https://github.com/rspamd/rspamd/issues/4409 for more information." + fi +} diff --git a/dev-libs/hyphen/files/hyphen-2.8.8-mawk.patch b/dev-libs/hyphen/files/hyphen-2.8.8-mawk.patch new file mode 100644 index 000000000000..a378db8d40ae --- /dev/null +++ b/dev-libs/hyphen/files/hyphen-2.8.8-mawk.patch @@ -0,0 +1,47 @@ +https://github.com/hunspell/hyphen/commit/3d05509b7ce8c350f4476830b00241025eeae329 +https://github.com/hunspell/hyphen/pull/12 + +From 3d05509b7ce8c350f4476830b00241025eeae329 Mon Sep 17 00:00:00 2001 +From: Philip Chimento <philip.chimento@gmail.com> +Date: Sat, 12 Nov 2016 00:36:06 -0800 +Subject: [PATCH] More portable awk script + +gensub() is specific to gawk, this uses gsub() instead in order to build +on platforms that don't have gawk such as macOS. +--- + lig.awk | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +diff --git a/lig.awk b/lig.awk +index 6737170..4ea5e46 100644 +--- a/lig.awk ++++ b/lig.awk +@@ -24,14 +24,20 @@ c=b + c!=b { print c } + + /f[1-9]?$/ { +- print gensub("f[1-9]?$", "ff", "g", b); +- if (c!=b) print gensub("f[1-9]?$", "ff", "g", c); +- +- print gensub("f[1-9]?$", "fi", "g", b); +- if (c!=b) print gensub("f[1-9]?$", "fi", "g", c); +- +- print gensub("f[1-9]?$", "fl", "g", b); +- if (c!=b) print gensub("f[1-9]?$", "fl", "g", c); ++ out=b; gsub("f[1-9]?$", "ff", out); print out ++ if (c!=b) { ++ out=c; gsub("f[1-9]?$", "ff", out); print out ++ } ++ ++ out=b; gsub("f[1-9]?$", "fi", out); print out ++ if (c!=b) { ++ out=c; gsub("f[1-9]?$", "fi", out); print out ++ } ++ ++ out=b; gsub("f[1-9]?$", "fl", out); print out ++ if (c!=b) { ++ out=c; gsub("f[1-9]?$", "fl", out); print out ++ } + } + + diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild index ec59ef06c25d..f53aaa413168 100644 --- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild +++ b/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild @@ -1,10 +1,10 @@ -# 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 DESCRIPTION="ALTLinux hyphenation library" -HOMEPAGE="http://hunspell.github.io/" +HOMEPAGE="https://hunspell.github.io/" SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1 MPL-1.1" @@ -18,6 +18,10 @@ BDEPEND="dev-lang/perl" DOCS=( AUTHORS ChangeLog NEWS README{,.nonstandard,.hyphen,.compound} THANKS TODO ) +PATCHES=( + "${FILESDIR}"/${P}-mawk.patch +) + src_configure() { econf $(use_enable static-libs static) } diff --git a/dev-libs/hyphen/metadata.xml b/dev-libs/hyphen/metadata.xml index 8acbf740b37a..eae9e8117d60 100644 --- a/dev-libs/hyphen/metadata.xml +++ b/dev-libs/hyphen/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">hunspell</remote-id> + <remote-id type="github">hunspell/hyphen</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/hyprland-protocols/Manifest b/dev-libs/hyprland-protocols/Manifest new file mode 100644 index 000000000000..a058aba02473 --- /dev/null +++ b/dev-libs/hyprland-protocols/Manifest @@ -0,0 +1 @@ +DIST hyprland-protocols-0.2.tar.gz 6343 BLAKE2B cffa25c1fbac992db9aee57956615c2a5f8a6e90150d86246218e6d346e566a43527f56cab08b07359bd2f56b1e02b741fb0dbb37ec35fbadd22dfdb2006d3b0 SHA512 f8534c0f6562ce3c770ed9c79b8b78504d6f3aa75001c74ecfa5418af939e88a020ca1cef08d20c62e73c764d66452b5ce212a0f0d2e9a3aaba635ee80b142c5 diff --git a/dev-libs/hyprland-protocols/hyprland-protocols-0.2.ebuild b/dev-libs/hyprland-protocols/hyprland-protocols-0.2.ebuild new file mode 100644 index 000000000000..d042b8fb75ba --- /dev/null +++ b/dev-libs/hyprland-protocols/hyprland-protocols-0.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +COMMIT=4d29e48433270a2af06b8bc711ca1fe5109746cd +DESCRIPTION="Wayland protocol extensions for Hyprland" +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" +LICENSE="BSD" +SLOT="0" + +RDEPEND="" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/wayland-scanner + virtual/pkgconfig +" diff --git a/dev-libs/qtcompress/metadata.xml b/dev-libs/hyprland-protocols/metadata.xml index d7f3ad8a7aaf..1273be6af080 100644 --- a/dev-libs/qtcompress/metadata.xml +++ b/dev-libs/hyprland-protocols/metadata.xml @@ -2,14 +2,14 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> - <email>alexey+gentoo@asokolov.org</email> - <name>Alexey Sokolov</name> + <email>julien@jroy.ca</email> + <name>Julien Roy</name> </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> <upstream> - <remote-id type="github">nezticle/qtcompress</remote-id> + <remote-id type="github">hyprwm/hyprland-protocols</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index cdf78708ebe4..7f16aad1d836 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1,2 +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 diff --git a/dev-libs/icu-layoutex/icu-layoutex-73.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-73.1.ebuild new file mode 100644 index 000000000000..1bc05984aaa4 --- /dev/null +++ b/dev-libs/icu-layoutex/icu-layoutex-73.1.ebuild @@ -0,0 +1,134 @@ +# 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="${BROOT}"/usr/share/openpgp-keys/icu.asc +inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig + +MY_PV=${PV/_rc/-rc} +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}" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +fi +IUSE="debug static-libs test" +RESTRICT="!test? ( test )" + +DEPEND=" + ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] + dev-libs/icu-le-hb[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) +" + +PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.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 + + eautoreconf +} + +src_configure() { + # 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 + # We want a minimal build as this is just for layoutex + # so we disable as much as possible + --disable-samples + --disable-extras + --disable-icuio + + # This is icu-layoutex, so.. + --enable-layoutex + + $(use_enable debug) + $(use_enable static-libs static) + + # Need tools for tests, otherwise get this in configure: + # "## Note: you have disabled ICU's tools. This ICU cannot build its own data or tests. + # ## Expect build failures in the 'data', 'test', and other directories." + # ... although layoutex has no tests right now anyway, but let's keep this + # for the future. + $(use_enable test tools) + $(use_enable test tests) + ) + + tc-is-cross-compiler && myeconfargs+=( + --with-cross-build="${WORKDIR}"/host + ) + + # icu tries to use clang by default + tc-export CC CXX + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +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 + pushd layoutex &>/dev/null || die + emake -j1 VERBOSE="1" check + popd &>/dev/null || die +} + +multilib_src_install() { + pushd layoutex &>/dev/null || die + default + popd &>/dev/null || die +} diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index cdf78708ebe4..7f16aad1d836 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +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 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 new file mode 100644 index 000000000000..ea943873a82b --- /dev/null +++ b/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch @@ -0,0 +1,82 @@ +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 new file mode 100644 index 000000000000..7f3f6a8e472f --- /dev/null +++ b/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch @@ -0,0 +1,49 @@ +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/icu-72.1.ebuild b/dev-libs/icu/icu-72.1.ebuild index 7763a58c4f85..c4141cbcefad 100644 --- a/dev-libs/icu/icu-72.1.ebuild +++ b/dev-libs/icu/icu-72.1.ebuild @@ -21,7 +21,7 @@ else 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + 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 diff --git a/dev-libs/icu/icu-73.1-r1.ebuild b/dev-libs/icu/icu-73.1-r1.ebuild new file mode 100644 index 000000000000..c8c62931c741 --- /dev/null +++ b/dev-libs/icu/icu-73.1-r1.ebuild @@ -0,0 +1,163 @@ +# 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" + "${FILESDIR}/${PN}-73.1-fix-UChar-api.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.1-r2.ebuild new file mode 100644 index 000000000000..1c7d2ab6aa59 --- /dev/null +++ b/dev-libs/icu/icu-73.1-r2.ebuild @@ -0,0 +1,163 @@ +# 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_{10..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" + "${FILESDIR}/${PN}-73.1-fix-UChar-api-deux.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 new file mode 100644 index 000000000000..a6d931245492 --- /dev/null +++ b/dev-libs/icu/icu-73.1.ebuild @@ -0,0 +1,162 @@ +# 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/igraph/Manifest b/dev-libs/igraph/Manifest index a540f679a9a4..66b81a40a784 100644 --- a/dev-libs/igraph/Manifest +++ b/dev-libs/igraph/Manifest @@ -1 +1 @@ -DIST igraph-0.9.4.tar.gz 3823988 BLAKE2B c62f15fd227a83da8a78c2bf569874e290c0f8ffd8c69353de1ff2fbd5dff290eceff2462495efc86f44303f3d9d0d397eba720a743da6c118dacb9eeff1b2b8 SHA512 1188d69b95f581d7dac5874dcdb2d1b1a322e39b275c6f092c199ed6214def814062bd46d573bdaa4bc8f4514d6840c6e93dedbe0f6c99a15de33cbc39356573 +DIST igraph-0.10.4.tar.gz 4279321 BLAKE2B 4e1fc8e8d6dd38cdb24ec564f51f2924e457376c258497b51d7dd4cec88d2226d5b202cdcfa69560e43fdb3cbd49656511178acd2ed705b4af26b1947a92f1ab SHA512 71bcec5f0ba100aae7614753f9232a4221580b822b4dc120e3a80eab59d70c42aedddb00728eb13faf7e522332c514c2e030314c416ded8a70e5de990ea8039b diff --git a/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch b/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch deleted file mode 100644 index 9bf9ed7bc764..000000000000 --- a/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -upstream issue - https://github.com/igraph/igraph/issues/1694 - ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -678,10 +678,8 @@ add_examples( - FOLDER examples/simple NAMES - igraph_scg_grouping - igraph_scg_grouping2 -- igraph_scg_grouping3 - igraph_scg_grouping4 - igraph_scg_semiprojectors -- igraph_scg_semiprojectors2 - igraph_scg_semiprojectors3 - scg - ) diff --git a/dev-libs/igraph/igraph-0.10.4-r1.ebuild b/dev-libs/igraph/igraph-0.10.4-r1.ebuild new file mode 100644 index 000000000000..55e82ab3fb68 --- /dev/null +++ b/dev-libs/igraph/igraph-0.10.4-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Creating and manipulating undirected and directed graphs" +HOMEPAGE="https://igraph.org/" +SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/0" +KEYWORDS="~amd64 ~x86" + +IUSE="debug test threads" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/gmp:0= + dev-libs/libxml2 + sci-libs/arpack + sci-mathematics/glpk:= + sci-mathematics/plfit + virtual/blas + virtual/lapack" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DUSE_CCACHE=OFF + -DIGRAPH_GLPK_SUPPORT=ON + -DIGRAPH_GRAPHML_SUPPORT=ON + -DIGRAPH_USE_INTERNAL_ARPACK=OFF + -DIGRAPH_USE_INTERNAL_BLAS=OFF + -DIGRAPH_USE_INTERNAL_GLPK=OFF + -DIGRAPH_USE_INTERNAL_GMP=OFF + -DIGRAPH_USE_INTERNAL_LAPACK=OFF + -DIGRAPH_USE_INTERNAL_PLFIT=OFF + -DIGRAPH_ENABLE_TLS=$(usex threads) + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_test() { + cmake_build check +} diff --git a/dev-libs/igraph/igraph-0.9.4.ebuild b/dev-libs/igraph/igraph-0.10.4.ebuild index 3e145244190d..bdefdfb07f82 100644 --- a/dev-libs/igraph/igraph-0.9.4.ebuild +++ b/dev-libs/igraph/igraph-0.10.4.ebuild @@ -1,17 +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 inherit cmake DESCRIPTION="Creating and manipulating undirected and directed graphs" -HOMEPAGE="http://www.igraph.org/" +HOMEPAGE="https://igraph.org/" SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/0" KEYWORDS="amd64 x86" + IUSE="debug test threads" RESTRICT="!test? ( test )" @@ -19,14 +20,11 @@ RDEPEND=" dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack - sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-broken-tests.patch ) - src_configure() { local mycmakeargs=( -DUSE_CCACHE=OFF @@ -34,10 +32,11 @@ src_configure() { -DIGRAPH_GRAPHML_SUPPORT=ON -DIGRAPH_USE_INTERNAL_ARPACK=OFF -DIGRAPH_USE_INTERNAL_BLAS=OFF - -DIGRAPH_USE_INTERNAL_CXSPARSE=OFF -DIGRAPH_USE_INTERNAL_GLPK=OFF -DIGRAPH_USE_INTERNAL_GMP=OFF -DIGRAPH_USE_INTERNAL_LAPACK=OFF + # Not packaged in ::gentoo atm + -DIGRAPH_USE_INTERNAL_PLFIT=ON -DIGRAPH_ENABLE_TLS=$(usex threads) -DBUILD_TESTING=$(usex test) ) diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest index b782847d7470..4bf4962b7f9d 100644 --- a/dev-libs/imath/Manifest +++ b/dev-libs/imath/Manifest @@ -1 +1,2 @@ DIST imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd +DIST imath-3.1.7.tar.gz 583049 BLAKE2B 54619339f349a944e1d72fcea4438d7bd2ef6c9655ba0e16ac608934a8df30c97a2f3cf5c75adaeb8a6fe6bf19ec3240c11439550b452571d0a8cbf75d6bd83e SHA512 e298454cb845cadde28f7881fdaa4739c3942f941278a07ec912459ac376c2ee7858cb3b2d2047b9afb4d4dacae7a8a52ffef4c104f8499b4e0a1f0ed46cc0f0 diff --git a/dev-libs/imath/imath-3.1.7.ebuild b/dev-libs/imath/imath-3.1.7.ebuild new file mode 100644 index 000000000000..2e490284d2c3 --- /dev/null +++ b/dev-libs/imath/imath-3.1.7.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +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" +# re-keywording needed for (according to ilmbase keywords): ~x64-macos +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" +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}] + 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/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-3.1-r3.ebuild b/dev-libs/iniparser/iniparser-3.1-r3.ebuild index 4f0dd7a5229f..37dc4fdbbabb 100644 --- a/dev-libs/iniparser/iniparser-3.1-r3.ebuild +++ b/dev-libs/iniparser/iniparser-3.1-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc examples" # the tests are rather examples than tests, no point in running them RESTRICT="test" 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..67b34398872b --- /dev/null +++ b/dev-libs/iniparser/iniparser-4.1-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 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/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild index 12cc53945091..b33fa3d128e6 100644 --- a/dev-libs/iniparser/iniparser-4.1.ebuild +++ b/dev-libs/iniparser/iniparser-4.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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" IUSE="doc examples" BDEPEND="doc? ( app-doc/doxygen )" 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 2e9434168059..0d585aedc090 100644 --- a/dev-libs/intel-compute-runtime/Manifest +++ b/dev-libs/intel-compute-runtime/Manifest @@ -1,2 +1,2 @@ -DIST intel-compute-runtime-22.43.24595.35.tar.gz 5880869 BLAKE2B c9d4a16e9908427b69154a5a6550e4eec47bcce4fa811a9121c54de75bcd3e17e1d4cff8b1fa7486b2ffe0dd01f7fae06e5fd3b1d241378dcf521d1f8822bedb SHA512 0aab6cc16f7d523819c9a9eb58fba916c3b06c4be450c94cfc30b36038c768d6ddb79937ded7d9df68b7bdc97679756450c1c54844caed1655ddc688a6ae8a54 -DIST intel-compute-runtime-22.49.25018.24.tar.gz 5991968 BLAKE2B 06589bd63d3cfe35ed0a1af3a94c9e12cc2588143dcf52a371b71f827ca006989a74edabb58b6ecc0a08cfa850f582e47e441ee8d9bffdf672653e8a7809375e SHA512 9c0cc541cd635063ed49e8f807c0a81035abd46367deb43fe7187c00c017f2609cd9c5e55d0b40bb3cb54d05f01306df3a843f3b35683b0ab732881b5192182f +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 diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.49.25018.24-level-zero-1.9.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.49.25018.24-level-zero-1.9.patch deleted file mode 100644 index 7527117ca032..000000000000 --- a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.49.25018.24-level-zero-1.9.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/level_zero/core/test/unit_tests/sources/fabric/test_fabric.cpp -+++ b/level_zero/core/test/unit_tests/sources/fabric/test_fabric.cpp -@@ -110,7 +110,7 @@ - const ze_pci_ext_properties_t &pciProperties) { - EXPECT_TRUE(0 == std::memcmp(vertexProperties.uuid.id, deviceProperties.uuid.id, sizeof(vertexProperties.uuid.id))); - if (deviceProperties.flags & ZE_DEVICE_PROPERTY_FLAG_SUBDEVICE) { -- EXPECT_EQ(vertexProperties.type, ZE_FABRIC_VERTEX_EXP_TYPE_SUBEVICE); -+ EXPECT_EQ(vertexProperties.type, ZE_FABRIC_VERTEX_EXP_TYPE_SUBDEVICE); - } else { - EXPECT_EQ(vertexProperties.type, ZE_FABRIC_VERTEX_EXP_TYPE_DEVICE); - } ---- a/level_zero/core/source/fabric/fabric.cpp -+++ b/level_zero/core/source/fabric/fabric.cpp -@@ -56,7 +56,7 @@ - memcpy_s(fabricVertex->properties.uuid.id, ZE_MAX_UUID_SIZE, deviceProperties.uuid.id, ZE_MAX_DEVICE_UUID_SIZE); - - if (deviceProperties.flags & ZE_DEVICE_PROPERTY_FLAG_SUBDEVICE) { -- fabricVertex->properties.type = ZE_FABRIC_VERTEX_EXP_TYPE_SUBEVICE; -+ fabricVertex->properties.type = ZE_FABRIC_VERTEX_EXP_TYPE_SUBDEVICE; - } else { - fabricVertex->properties.type = ZE_FABRIC_VERTEX_EXP_TYPE_DEVICE; - } diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.43.24595.35.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.26.ebuild index cda27132f096..893db4b58b43 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.43.24595.35.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.26.ebuild @@ -19,18 +19,19 @@ SLOT="0" KEYWORDS="amd64" IUSE="+l0 +vaapi" -RDEPEND=">=media-libs/gmmlib-22.1.7:=" +RDEPEND=">=media-libs/gmmlib-22.3.5:=" DEPEND=" ${DEPEND} - >=dev-libs/intel-metrics-library-0_pre20220930:= + 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.12149.1 - >=dev-util/intel-graphics-system-controller-0.8.4:= + >=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.8.5:= ) + l0? ( >=dev-libs/level-zero-1.11.0:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva @@ -41,7 +42,9 @@ BDEPEND="virtual/pkgconfig" DOCS=( "README.md" "FAQ.md" ) -PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" +) src_prepare() { # Remove '-Werror' from default @@ -52,7 +55,7 @@ src_prepare() { src_configure() { # See https://github.com/intel/compute-runtime/issues/531 - filter-flags -flto=* -flto + filter-lto local mycmakeargs=( -DCCACHE_ALLOWED="OFF" diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.49.25018.24.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.17.26241.15.ebuild index 0af0d80dab75..fadfb30dc042 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.49.25018.24.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.17.26241.15.ebuild @@ -19,18 +19,19 @@ SLOT="0" KEYWORDS="~amd64" IUSE="+l0 +vaapi" -RDEPEND=">=media-libs/gmmlib-22.1.7:=" +RDEPEND=">=media-libs/gmmlib-22.3.5:=" DEPEND=" ${DEPEND} - >=dev-libs/intel-metrics-library-0_pre20220930:= + 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.12812.26 + >=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.9.4:= ) + l0? ( >=dev-libs/level-zero-1.11.0:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva @@ -43,7 +44,6 @@ DOCS=( "README.md" "FAQ.md" ) PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" - "${FILESDIR}/${PN}-22.49.25018.24-level-zero-1.9.patch" ) src_prepare() { @@ -55,7 +55,7 @@ src_prepare() { src_configure() { # See https://github.com/intel/compute-runtime/issues/531 - filter-flags -flto=* -flto + filter-lto local mycmakeargs=( -DCCACHE_ALLOWED="OFF" diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest new file mode 100644 index 000000000000..05fdbbdedb8f --- /dev/null +++ b/dev-libs/intel-metrics-discovery/Manifest @@ -0,0 +1 @@ +DIST metrics-discovery-1.12.164.tar.gz 4235286 BLAKE2B f2a707fd2b43e096ad1c02032558c141add286d9f8cef20a317f5109245328ae7d22dd1acec64df99ef17dd652e67e5cba8db0e3271dd2259138924218ef893a SHA512 8e8e00d75ba14abecd9c650c0f5a33dd8f46396e8ed4f2a4eefb1b76b87cfc38ad47740dddd00698c09055a79e12ac2a4b23187c0b6146b4ef0745b21f0bf975 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.164.ebuild new file mode 100644 index 000000000000..457d080c331c --- /dev/null +++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild @@ -0,0 +1,32 @@ +# 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 + +DESCRIPTION="A user mode library that provides access to GPU performance data" +HOMEPAGE="https://github.com/intel/compute-runtime" +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/${PV}" +KEYWORDS="amd64" + +DEPEND="x11-libs/libdrm" +RDEPEND="${DEPEND}" + +src_prepare() { + default + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( -DLINUX_DISTRO="Gentoo" ) + cmake_src_configure +} diff --git a/dev-libs/intel-metrics-discovery/metadata.xml b/dev-libs/intel-metrics-discovery/metadata.xml new file mode 100644 index 000000000000..446f29fca8dd --- /dev/null +++ b/dev-libs/intel-metrics-discovery/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" proxied="yes"> + <email>gentoo@taujhe.de</email> + <name>Jan Henke</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + This software is a user mode library that + provides access to GPU performance data. + The library has OS abstraction layer that + allows for interoperability in different environments. + </longdescription> + <upstream> + <remote-id type="github">intel/metrics-discovery</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest index 5772ae357791..548400db30cf 100644 --- a/dev-libs/intel-metrics-library/Manifest +++ b/dev-libs/intel-metrics-library/Manifest @@ -1 +1 @@ -DIST intel-metrics-library-0_pre20220930.tar.gz 245113 BLAKE2B c6736d0da39a577283bab77fad483d4f5f11f20fd85133682eee1686a24cdb4aedfb61a9a4ca7ab253b26a08ed22327ea4131c8d6612ca61f68b293015f8b40a SHA512 ef159fa28a8df3c707b6fe743819e97e20cadb8c731650b79dc780a938c9165a0cd1acd497319a66a75bf08990067a31b652a49c8b8f80905ee25b0e4c0532dc +DIST intel-metrics-library-0_pre20230417.tar.gz 248881 BLAKE2B 83b3fb48fcb01668bda98c3a5fff1829d89686dd2731163f24a43614ac6b21c2f618be9d2f80115e2ceeffc4df0880e2dfea72a9255d3430f60a88ecd66a8893 SHA512 1b5878528e2146c9811b43b74ddb94f14b1127dc0e6231cc4ff0993d528c8ccea4d9ba52a8e50b409eb9f0e9776cbe04df7c0d1e94a8cf7020b97b822b430c13 diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220930.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild index 697e148d2c5a..9940af2c6e7c 100644 --- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220930.ebuild +++ b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild @@ -4,7 +4,7 @@ EAPI=8 CMAKE_BUILD_TYPE="Release" -EGIT_COMMIT="f829f43a06bfbbdf026b5455d74482d476dd7a02" +EGIT_COMMIT="5524ef74cf0423006992a52571590cb8bc2d7468" MY_PN="${PN/intel-/}" MY_P="${MY_PN}-${PV}" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/intel/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P} S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}" LICENSE="MIT" -SLOT="0/114" +SLOT="0/133" KEYWORDS="amd64" DEPEND="x11-libs/libdrm" diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest index dd4fd7da77db..7f4fca732c5c 100644 --- a/dev-libs/intel-vc-intrinsics/Manifest +++ b/dev-libs/intel-vc-intrinsics/Manifest @@ -1,3 +1,2 @@ -DIST intel-vc-intrinsics-0.11.0.tar.gz 139044 BLAKE2B 2d1ba293188821c551c4d0faf8426c3480f6aac631016db4a9bfebbb90c9b9e4ab76feb2716388fbf540153fe54d884377d7afda1dd6524ece15f88696d9d679 SHA512 a2d96133031305d9b772be70bd3d612b04319ad2fd4eec17445e7322352fb3a054e323b718c3a409089d597825d5737fa21f01a1ede32e5c1c84f68815f6f050 -DIST intel-vc-intrinsics-0.7.1.tar.gz 138162 BLAKE2B 6a3aa8dcec358dd2f19688a57e5efd267eb6fd208f21c0bbda12baae4b73b4a85462e930f06fb34d22fe15103af368e8763031b2ef668a677104c57231740ff4 SHA512 278c67e277c09a2a8f5d6aed77e4c7d7dfd7fc54f9e34b8fae2154641785b66eec298e02bffa84f8cf4d0824e0272f7fb659d0ea19d2a993b5c44bb2e6f5a076 -DIST intel-vc-intrinsics-0.8.1.tar.gz 138462 BLAKE2B 0f86f5fbeb7931a564eb598d527fd67e96489d0f2e7dba7166ffa468470022eff05e150877c3dd380ad003beb8651a0ac9ffe9c3dceeae6552c46b5f3e00aa64 SHA512 9763f1b624121694d6880ca3ffdf2e344ce3ed1a39c1c1e7dc06195b79acccce5e3d86032bba5c0de440376821c383f8ff59fdd57b0ae93fede17595b0fe0b42 +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 diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.7.1-r1.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.1-r1.ebuild index 591c7d20746d..2b261917684a 100644 --- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.7.1-r1.ebuild +++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 CMAKE_BUILD_TYPE="Release" -LLVM_MAX_SLOT="14" +LLVM_MAX_SLOT="15" MY_PN="${PN/intel-/}" MY_P="${MY_PN}-${PV}" PYTHON_COMPAT=( python3_{9..11} ) @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" dev-libs/libxml2:2= diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.11.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.3.ebuild index 591c7d20746d..0fb48b3f3aba 100644 --- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.11.0.ebuild +++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.3.ebuild @@ -4,7 +4,7 @@ EAPI=8 CMAKE_BUILD_TYPE="Release" -LLVM_MAX_SLOT="14" +LLVM_MAX_SLOT="15" MY_PN="${PN/intel-/}" MY_P="${MY_PN}-${PV}" PYTHON_COMPAT=( python3_{9..11} ) diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.8.1.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.8.1.ebuild deleted file mode 100644 index 591c7d20746d..000000000000 --- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.8.1.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="14" -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/isa-l/isa-l-2.30.0-r1.ebuild b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild index 793f5856db3f..0b993e7daf1a 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 @@ -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=8 @@ -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 ~riscv" +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/isa-l_crypto/Manifest b/dev-libs/isa-l_crypto/Manifest new file mode 100644 index 000000000000..4934b64eadcb --- /dev/null +++ b/dev-libs/isa-l_crypto/Manifest @ |