diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest index 8692b7bb68..5b21488bb3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest @@ -1,3 +1,2 @@ -DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf9a554b892e1f7f8b8d089e8dca58da347527c595881e1119344858694c133ba0f1676424914f6518adbf4f4 SHA512 13edbe961e0482677aff52ada93129500c10e134b579365f1d0cd180a898251f3060f1fe0597fc6c900c0ea29b1eb28fc2519b0ebfa2ed496a777bf7e138feae DIST re2c-2.2.tar.xz 1460740 BLAKE2B f9e5920cb31c7ae8fa9f880be30513eee33ad23bcc7d44b24bbcb93376e13b092f6d0bee3304e49f87430be54b868c43115592a2accfdd94cda0d789b234f43b SHA512 8c4f18fa9a2ef6b0b5c03b73b8b7deafcbd7b17baf72e0008c9344296fcb0abeee6024d4a78ccb15b090e37ae67ddd6f2a68b4932331096328530612112ee37a DIST re2c-3.1.tar.xz 1448624 BLAKE2B ecf9e750aa94d9754d703ad65df50786e800ed8ad40f4cce39a24ae4154d7b73db60cacb4e77e371d175c2d16393a812d38fb8af780bc1fb9d1f64c7964bd4f7 SHA512 649c5e103f8012e2717a0c36af135601dfa0a090c3e400bbf466537e7038ad73bc9e0ed36c3717b7c3c785c24ad024d40c7c31998325a14caf4984c4f19cd998 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/files/re2c-2.1.1-sh.patch b/sdk_container/src/third_party/portage-stable/dev-util/re2c/files/re2c-2.1.1-sh.patch deleted file mode 100644 index 7caa5d7d1a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/files/re2c-2.1.1-sh.patch +++ /dev/null @@ -1,48 +0,0 @@ -Matt noticed errors when running ./configure on dash: - ./configure: 5339: test: x: unexpected operator - ./configure: 5386: test: x: unexpected operator - -The change is to use POSIX '=' comparison instead of bash-specific ==. - -Patch-by: Matt Whitlock -https://bugs.gentoo.org/779187 ---- a/configure.ac 2021-03-27 18:25:24.000000000 +0000 -+++ b/configure.ac 2021-03-30 01:34:01.993467424 +0000 -@@ -65,7 +65,7 @@ - # --enable-benchmarks - AC_ARG_ENABLE([benchmarks], [AS_HELP_STRING([--enable-benchmarks], - [build benchmarks])]) --AM_CONDITIONAL([WITH_BENCHMARKS], [test "x$enable_benchmarks" == "xyes"]) -+AM_CONDITIONAL([WITH_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"]) - AM_COND_IF([WITH_BENCHMARKS], [ - AC_LANG_PUSH([C++]) - AC_CHECK_HEADERS([benchmark/benchmark.h], [], -@@ -79,7 +79,7 @@ - [AS_HELP_STRING([--enable-benchmarks-regenerate], - [regenerate C code for benchmarks])]) - AM_CONDITIONAL([REGEN_BENCHMARKS], -- [test "x$enable_benchmarks_regenerate" == "xyes"]) -+ [test "x$enable_benchmarks_regenerate" = "xyes"]) - - - # checks for programs ---- a/configure -+++ b/configure -@@ -5336,7 +5336,7 @@ if test "${enable_benchmarks+set}" = set; then : - enableval=$enable_benchmarks; - fi - -- if test "x$enable_benchmarks" == "xyes"; then -+ if test "x$enable_benchmarks" = "xyes"; then - WITH_BENCHMARKS_TRUE= - WITH_BENCHMARKS_FALSE='#' - else -@@ -5383,7 +5383,7 @@ if test "${enable_benchmarks_regenerate+set}" = set; then : - enableval=$enable_benchmarks_regenerate; - fi - -- if test "x$enable_benchmarks_regenerate" == "xyes"; then -+ if test "x$enable_benchmarks_regenerate" = "xyes"; then - REGEN_BENCHMARKS_TRUE= - REGEN_BENCHMARKS_FALSE='#' - else diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild deleted file mode 100644 index a6a57cbd40..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="tool for generating C-based recognizers from regular expressions" -HOMEPAGE="http://re2c.org/" -SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug" - -PATCHES=("${FILESDIR}"/${P}-sh.patch) - -src_prepare() { - default - - # Only needed for the sh patch - # Despite the patch modifying the configure directly, - # this is sometimes fragile and triggers maintainer mode anyway. - # bug #779187 - eautoreconf -} - -src_configure() { - econf \ - --enable-golang \ - ac_cv_path_BISON="no" \ - $(use_enable debug) -} - -src_install() { - default - - docompress -x /usr/share/doc/${PF}/examples - dodoc -r README.md CHANGELOG examples -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild index b7a6f451fa..4aa75393bb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-any-r1 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-3.1.ebuild index d285e9d937..47be69c035 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-3.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-any-r1