diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-07-15 06:16:46 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-07-15 06:16:46 +0000 |
commit | d599869acdd1cd86b2796c4f43966e75010d311a (patch) | |
tree | 9f76540f2b2be12583d8b2bebe9c0ea4c93f0ec1 | |
parent | 2023-07-15 05:31:52 UTC (diff) | |
parent | sys-fs/fscrypt: Stabilize 0.3.4 amd64, #910359 (diff) | |
download | gentoo-d599869acdd1cd86b2796c4f43966e75010d311a.tar.gz gentoo-d599869acdd1cd86b2796c4f43966e75010d311a.tar.bz2 gentoo-d599869acdd1cd86b2796c4f43966e75010d311a.zip |
Merge updates from master
31 files changed, 296 insertions, 61 deletions
diff --git a/dev-lang/perl/perl-5.36.1-r2.ebuild b/dev-lang/perl/perl-5.36.1-r3.ebuild index c6d00e837cca..1f35736fe688 100644 --- a/dev-lang/perl/perl-5.36.1-r2.ebuild +++ b/dev-lang/perl/perl-5.36.1-r3.ebuild @@ -69,8 +69,8 @@ DEPEND="${RDEPEND}" BDEPEND="${RDEPEND}" PDEPEND=" + >=app-admin/perl-cleaner-2.30 !minimal? ( - >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 diff --git a/dev-lang/perl/perl-5.38.0.ebuild b/dev-lang/perl/perl-5.38.0-r1.ebuild index 1f2dc498827c..bcfda0628266 100644 --- a/dev-lang/perl/perl-5.38.0.ebuild +++ b/dev-lang/perl/perl-5.38.0-r1.ebuild @@ -69,8 +69,8 @@ DEPEND="${RDEPEND}" BDEPEND="${RDEPEND}" PDEPEND=" + >=app-admin/perl-cleaner-2.30 !minimal? ( - >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 diff --git a/dev-libs/librdkafka/librdkafka-2.1.1.ebuild b/dev-libs/librdkafka/librdkafka-2.1.1.ebuild index 429e0ce95764..d5b761b1d74b 100644 --- a/dev-libs/librdkafka/librdkafka-2.1.1.ebuild +++ b/dev-libs/librdkafka/librdkafka-2.1.1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" fi LICENSE="BSD-2" diff --git a/dev-libs/nettle/nettle-3.9.1.ebuild b/dev-libs/nettle/nettle-3.9.1.ebuild index d8040a8f3f84..5ba161341399 100644 --- a/dev-libs/nettle/nettle-3.9.1.ebuild +++ b/dev-libs/nettle/nettle-3.9.1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" LICENSE="|| ( LGPL-3 LGPL-2.1 )" # Subslot = libnettle - libhogweed soname version SLOT="0/8-6" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" # The arm64 crypto option controls AES, SHA1, and SHA2 usage. REQUIRED_USE=" diff --git a/dev-libs/newt/newt-0.52.23-r1.ebuild b/dev-libs/newt/newt-0.52.23-r1.ebuild index 0cb4a65cfc85..509558ce5430 100644 --- a/dev-libs/newt/newt-0.52.23-r1.ebuild +++ b/dev-libs/newt/newt-0.52.23-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2" SLOT="0" -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" IUSE="gpm nls tcl" RESTRICT="test" diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index 9b7ecd5e52b8..f5f8e34fd5a9 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1 +1,2 @@ DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 +DIST spdlog-1.12.0.tar.gz 251037 BLAKE2B 3170f1e680fc4652ed8ddc0f74627aec22149f028def599fc5ed4db3a942d840006963789577f2e3df0e2b8ca1d98a881f3b96be5e1174fdf0acea15b3676d6e SHA512 db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d diff --git a/dev-libs/spdlog/files/spdlog-fmt-10.patch b/dev-libs/spdlog/files/spdlog-fmt-10.patch new file mode 100644 index 000000000000..5ee44c41ea6a --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-fmt-10.patch @@ -0,0 +1,121 @@ +diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h +index f6f1bb1d..90af9676 100644 +--- a/include/spdlog/sinks/daily_file_sink.h ++++ b/include/spdlog/sinks/daily_file_sink.h +@@ -13,6 +13,9 @@ + #include <spdlog/details/circular_q.h> + #include <spdlog/details/synchronous_factory.h> + ++#include <iostream> ++#include <sstream> ++#include <iomanip> + #include <chrono> + #include <cstdio> + #include <ctime> +@@ -46,46 +49,15 @@ struct daily_filename_calculator + */ + struct daily_filename_format_calculator + { +- static filename_t calc_filename(const filename_t &filename, const tm &now_tm) ++ static filename_t calc_filename(const filename_t &file_path, const tm &now_tm) + { +-#ifdef SPDLOG_USE_STD_FORMAT +- // adapted from fmtlib: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/chrono.h#L522-L546 +- +- filename_t tm_format; +- tm_format.append(filename); +- // By appending an extra space we can distinguish an empty result that +- // indicates insufficient buffer size from a guaranteed non-empty result +- // https://github.com/fmtlib/fmt/issues/2238 +- tm_format.push_back(' '); +- +- const size_t MIN_SIZE = 10; +- filename_t buf; +- buf.resize(MIN_SIZE); +- for (;;) +- { +- size_t count = strftime(buf.data(), buf.size(), tm_format.c_str(), &now_tm); +- if (count != 0) +- { +- // Remove the extra space. +- buf.resize(count - 1); +- break; +- } +- buf.resize(buf.size() * 2); +- } +- +- return buf; ++#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) ++ std::wstringstream stream; + #else +- // generate fmt datetime format string, e.g. {:%Y-%m-%d}. +- filename_t fmt_filename = fmt::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{{:{}}}")), filename); +- +- // MSVC doesn't allow fmt::runtime(..) with wchar, with fmtlib versions < 9.1.x +-# if defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) && FMT_VERSION < 90101 +- return fmt::format(fmt_filename, now_tm); +-# else +- return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm); +-# endif +- ++ std::stringstream stream; + #endif ++ stream << std::put_time(&now_tm, file_path.c_str()); ++ return stream.str(); + } + + private: +diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h +index 71544e84..1d802f32 100644 +--- a/include/spdlog/logger.h ++++ b/include/spdlog/logger.h +@@ -369,9 +369,9 @@ protected: + { + memory_buf_t buf; + #ifdef SPDLOG_USE_STD_FORMAT +- fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward<Args>(args)...)); ++ fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(args...)); + #else +- fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward<Args>(args)...)); ++ fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(args...)); + #endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); +@@ -395,10 +395,9 @@ protected: + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + # ifdef SPDLOG_USE_STD_FORMAT +- fmt_lib::vformat_to( +- std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(std::forward<Args>(args)...)); ++ fmt_lib::vformat_to(std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(args...)); + # else +- fmt::vformat_to(std::back_inserter(wbuf), fmt, fmt::make_format_args<fmt::wformat_context>(std::forward<Args>(args)...)); ++ fmt::vformat_to(std::back_inserter(wbuf), fmt, fmt::make_format_args<fmt::wformat_context>(args...)); + # endif + + memory_buf_t buf; +diff --git a/include/spdlog/common.h b/include/spdlog/common.h +index e69201a8..5f671c5c 100644 +--- a/include/spdlog/common.h ++++ b/include/spdlog/common.h +@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>; + template<class T> + using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type; + ++template <typename Char> ++#if FMT_VERSION >= 90101 ++using fmt_runtime_string = fmt::runtime_format_string<Char>; ++#else ++using fmt_runtime_string = fmt::basic_runtime<Char>; ++#endif ++ + // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, + // in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char> + template<class T, class Char = char> + struct is_convertible_to_basic_format_string + : std::integral_constant<bool, +- std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value> ++ std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value> + {}; + + # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) diff --git a/dev-libs/spdlog/spdlog-1.11.0-r2.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild index 7d751c92f18e..a513025d8d54 100644 --- a/dev-libs/spdlog/spdlog-1.11.0-r2.ebuild +++ b/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild @@ -24,13 +24,16 @@ RESTRICT="!test? ( test )" BDEPEND=" virtual/pkgconfig " + DEPEND=" - dev-libs/libfmt:0/9.1.0 + dev-libs/libfmt " + RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" + "${FILESDIR}/${PN}-fmt-10.patch" "${FILESDIR}/${PN}-musl-1.2.4.patch" ) diff --git a/dev-libs/spdlog/spdlog-1.12.0.ebuild b/dev-libs/spdlog/spdlog-1.12.0.ebuild new file mode 100644 index 000000000000..a349688f3d36 --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.12.0.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="Fast C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/${PN}" +else + SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0/1" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig +" + +DEPEND=" + dev-libs/libfmt +" + +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-force_external_fmt.patch" +) + +src_prepare() { + cmake_src_prepare + rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" +} + +src_configure() { + local mycmakeargs=( + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_EXAMPLE=no + -DSPDLOG_FMT_EXTERNAL=yes + -DSPDLOG_BUILD_SHARED=yes + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-python/pymongo/pymongo-4.3.3.ebuild b/dev-python/pymongo/pymongo-4.3.3.ebuild index 1414f0687773..19481d6ef8cb 100644 --- a/dev-python/pymongo/pymongo-4.3.3.ebuild +++ b/dev-python/pymongo/pymongo-4.3.3.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ~hppa ~riscv ~x86" +KEYWORDS="amd64 arm64 ~hppa ~riscv ~x86" IUSE="doc kerberos" RDEPEND=" diff --git a/dev-python/pywlroots/pywlroots-0.15.24-r1.ebuild b/dev-python/pywlroots/pywlroots-0.15.24-r2.ebuild index dc67164d0571..6c3c93aba474 100644 --- a/dev-python/pywlroots/pywlroots-0.15.24-r1.ebuild +++ b/dev-python/pywlroots/pywlroots-0.15.24-r2.ebuild @@ -30,6 +30,7 @@ RDEPEND=" >=dev-python/pywayland-0.4.14[${PYTHON_USEDEP}] >=dev-python/xkbcommon-0.2[${PYTHON_USEDEP}] =gui-libs/wlroots-$(ver_cut 1-2)*:= + x11-base/xwayland " DEPEND="${RDEPEND}" diff --git a/dev-python/pywlroots/pywlroots-0.16.4.ebuild b/dev-python/pywlroots/pywlroots-0.16.4-r1.ebuild index 59ccc3eae06e..2383e3084456 100644 --- a/dev-python/pywlroots/pywlroots-0.16.4.ebuild +++ b/dev-python/pywlroots/pywlroots-0.16.4-r1.ebuild @@ -27,6 +27,7 @@ DEPEND=" >=dev-python/pywayland-0.4.14[${PYTHON_USEDEP}] >=dev-python/xkbcommon-0.2[${PYTHON_USEDEP}] =gui-libs/wlroots-$(ver_cut 1-2)*:= + x11-base/xwayland " RDEPEND=" ${DEPEND} diff --git a/dev-python/pyzmq/pyzmq-25.1.0.ebuild b/dev-python/pyzmq/pyzmq-25.1.0.ebuild index e5fcd976e57e..beb30b72d634 100644 --- a/dev-python/pyzmq/pyzmq-25.1.0.ebuild +++ b/dev-python/pyzmq/pyzmq-25.1.0.ebuild @@ -25,7 +25,7 @@ SRC_URI=" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="drafts" # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled. diff --git a/dev-ruby/elasticsearch/elasticsearch-7.17.7.ebuild b/dev-ruby/elasticsearch/elasticsearch-7.17.7-r1.ebuild index eac1ce5d94aa..eac4edac7c65 100644 --- a/dev-ruby/elasticsearch/elasticsearch-7.17.7.ebuild +++ b/dev-ruby/elasticsearch/elasticsearch-7.17.7-r1.ebuild @@ -5,6 +5,7 @@ EAPI=8 USE_RUBY="ruby30 ruby31" +RUBY_FAKEGEM_BINWRAP="" RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" RUBY_FAKEGEM_RECIPE_TEST="rspec3" diff --git a/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.1.0.ebuild b/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.1.0.ebuild index e27cf47e62a1..f72e2522a7e1 100644 --- a/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.1.0.ebuild +++ b/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.1.0.ebuild @@ -28,6 +28,10 @@ ruby_add_rdepend " dev-ruby/net-http-persistent:4 " +ruby_add_depend "test? ( + >=dev-ruby/webmock-3.4 +)" + all_ruby_prepare() { sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die diff --git a/dev-ruby/tty-file/tty-file-0.10.0.ebuild b/dev-ruby/tty-file/tty-file-0.10.0.ebuild deleted file mode 100644 index e4f10de183ad..000000000000 --- a/dev-ruby/tty-file/tty-file-0.10.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby26 ruby27 ruby30 ruby31" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -RUBY_FAKEGEM_BINWRAP="" - -inherit ruby-fakegem - -DESCRIPTION="File manipulation utility methods" -HOMEPAGE="https://github.com/piotrmurach/tty-file" -SRC_URI="https://github.com/piotrmurach/tty-file/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend " - >=dev-ruby/diff-lcs-1.3:0 - >=dev-ruby/pastel-0.8:0 - >=dev-ruby/tty-prompt-0.22:0 -" - -ruby_add_bdepend "test? ( dev-ruby/webmock )" - -all_ruby_prepare() { - sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die - echo '-rspec_helper' > .rspec || die -} - -each_ruby_prepare() { - mkdir tmp || die -} diff --git a/dev-ruby/twitter-text/twitter-text-3.1.0-r2.ebuild b/dev-ruby/twitter-text/twitter-text-3.1.0-r2.ebuild new file mode 100644 index 000000000000..a580eefc866d --- /dev/null +++ b/dev-ruby/twitter-text/twitter-text-3.1.0-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby30 ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_EXTRAINSTALL="config" + +inherit ruby-fakegem + +DESCRIPTION="Text handling for Twitter" +HOMEPAGE="https://github.com/twitter/twitter-text" + +LICENSE="MIT" +SLOT="$(ver_cut 1-2)" +KEYWORDS="~amd64 ~riscv" +IUSE="" + +ruby_add_rdepend " + dev-ruby/idn-ruby + =dev-ruby/unf-0.1* +" + +ruby_add_bdepend "test? ( >=dev-ruby/nokogiri-1.8.0 )" + +PATCHES=( + "${FILESDIR}/${PN}-3.1.0-frozen-string.patch" +) + +all_ruby_prepare() { + #sed -i -e 's/2.14.0/2.14/' twitter-text.gemspec || die + sed -i -e '/simplecov/,/end/ s:^:#:' spec/spec_helper.rb || die +} diff --git a/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild b/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild index c0025e9f5408..5e00a48f8e06 100644 --- a/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild +++ b/dev-ruby/typed-array/typed-array-0.1.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 @@ -7,7 +7,7 @@ RUBY_FAKEGEM_DOCDIR="doc" RUBY_FAKEGEM_EXTRADOC="README.rdoc" RUBY_FAKEGEM_RECIPE_TEST="rspec3" -USE_RUBY="ruby26 ruby27 ruby30 ruby31" +USE_RUBY="ruby30 ruby31 ruby32" inherit ruby-fakegem DESCRIPTION="Gem provides enforced-type functionality to Arrays" @@ -21,4 +21,6 @@ IUSE="" all_ruby_prepare() { # There is a trash... rm "${S}"/lib/typed-array/.DS_Store || die + + sed -i -e 's/Fixnum/Integer/' spec/typed-array_spec.rb || die } diff --git a/dev-ruby/vlad/vlad-2.7.1-r1.ebuild b/dev-ruby/vlad/vlad-2.7.1-r1.ebuild new file mode 100644 index 000000000000..c96c268f71e7 --- /dev/null +++ b/dev-ruby/vlad/vlad-2.7.1-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby30 ruby31 ruby32" + +RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt" + +inherit ruby-fakegem + +DESCRIPTION="Pragmatic application deployment automation, without mercy" +HOMEPAGE="https://github.com/seattlerb/vlad" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_bdepend ">=dev-ruby/hoe-3.13 + test? ( >=dev-ruby/minitest-5.7 )" +ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.3" + +all_ruby_prepare() { + # Keep Isolate from managing the dependencies. + sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die +} diff --git a/dev-util/maturin/maturin-1.1.0.ebuild b/dev-util/maturin/maturin-1.1.0.ebuild index 5fcb9ae701b5..659af44e60c3 100644 --- a/dev-util/maturin/maturin-1.1.0.ebuild +++ b/dev-util/maturin/maturin-1.1.0.ebuild @@ -389,7 +389,7 @@ LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 Unicode-DFS-2016" # crates SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="doc +ssl test" RESTRICT="!test? ( test )" diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild index 404aa6a8f555..a8659f07bcf4 100644 --- a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild +++ b/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 GPL-2" SLOT="0" -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="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" diff --git a/media-libs/opencv/opencv-4.7.0.ebuild b/media-libs/opencv/opencv-4.7.0.ebuild index c3ec87262b13..15fd917278e6 100644 --- a/media-libs/opencv/opencv-4.7.0.ebuild +++ b/media-libs/opencv/opencv-4.7.0.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0/${PV}" # subslot = libopencv* soname version -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild index 507f44891cfd..8aff4c81106b 100644 --- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild @@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86" IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot" diff --git a/net-irc/anope/anope-2.0.13.ebuild b/net-irc/anope/anope-2.0.13.ebuild index 2f40bfaf5471..88159b72e6e0 100644 --- a/net-irc/anope/anope-2.0.13.ebuild +++ b/net-irc/anope/anope-2.0.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 x86" +KEYWORDS="amd64 arm arm64 x86" IUSE="gnutls ldap mysql pcre sql sqlite ssl tre" REQUIRED_USE="sql? ( || ( mysql sqlite ) )" diff --git a/sys-apps/portage/portage-3.0.49-r1.ebuild b/sys-apps/portage/portage-3.0.49-r1.ebuild index 5375872b2127..0108022357f3 100644 --- a/sys-apps/portage/portage-3.0.49-r1.ebuild +++ b/sys-apps/portage/portage-3.0.49-r1.ebuild @@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi LICENSE="GPL-2" diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch new file mode 100644 index 000000000000..da2a10e0afbf --- /dev/null +++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch @@ -0,0 +1,25 @@ +From f912f6630eada34dcfb1320bb46b02d149c32ad4 Mon Sep 17 00:00:00 2001 +From: Gwendal Grignou <gwendal@chromium.org> +Date: Wed, 28 Jun 2023 16:08:41 -0700 +Subject: [PATCH] [base] Never use gcc directly + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index b1fd4aa..342daf7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -363,7 +363,7 @@ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE)) + + lib/libft.so: $(LIBFT_OBJECTS) + @echo " [LD]" $@ +- $(V) gcc -shared -o $@ $+ -laio ++ $(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $+ -laio + + .PHONEY: functional-test unit-test + +-- +2.41.0.255.g8b1d071c50-goog + diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r2.ebuild index 42ab5f59eb01..072dbecae727 100644 --- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild +++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r2.ebuild @@ -33,6 +33,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch + "${FILESDIR}"/${PN}-0.9.0-build-fixes.patch "${FILESDIR}"/0.9.0-remove-boost_iostreams.patch ) diff --git a/sys-devel/clang/clang-14.0.6-r4.ebuild b/sys-devel/clang/clang-14.0.6-r4.ebuild index 7360724add49..34eaae7e6f6e 100644 --- a/sys-devel/clang/clang-14.0.6-r4.ebuild +++ b/sys-devel/clang/clang-14.0.6-r4.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos" IUSE=" debug default-compiler-rt default-libcxx default-lld doc llvm-libunwind +pie +static-analyzer test xml diff --git a/sys-devel/clang/clang-15.0.7-r3.ebuild b/sys-devel/clang/clang-15.0.7-r3.ebuild index 3e90bb023a80..228d385dd9f6 100644 --- a/sys-devel/clang/clang-15.0.7-r3.ebuild +++ b/sys-devel/clang/clang-15.0.7-r3.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="${LLVM_MAJOR}/${LLVM_SOABI}g1" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos" IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" diff --git a/sys-fs/fscrypt/fscrypt-0.3.4.ebuild b/sys-fs/fscrypt/fscrypt-0.3.4.ebuild index f7c15620c327..1e4eba12360d 100644 --- a/sys-fs/fscrypt/fscrypt-0.3.4.ebuild +++ b/sys-fs/fscrypt/fscrypt-0.3.4.ebuild @@ -18,7 +18,7 @@ SRC_URI=" # MIT: BurntSushi/toml, kisielk/gotool, kr/*, urfave/cli, honnef.co/go/tools LICENSE="Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND="sys-libs/pam" RDEPEND="${DEPEND}" diff --git a/x11-terms/xterm/xterm-382.ebuild b/x11-terms/xterm/xterm-382.ebuild index 54d702486e9d..db00b23e8a34 100644 --- a/x11-terms/xterm/xterm-382.ebuild +++ b/x11-terms/xterm/xterm-382.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama" DEPEND=" |