4 files changed, 82 insertions, 2 deletions
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 1e2aac23b99a..df0b01eabaf5 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,3 +1,6 @@
+AUX re2c-2.1.1-sh.patch 1688 BLAKE2B 1143d1d5867c07aaa48e3c1795b1c4867eba665315a583d4991872b457a7ba222dac1c699917cf02b6d55306e6de3a5e0c65cf2f0505ec4283b7833522b5bb39 SHA512 33b48ee8f4ab871958eff901596c1282823eb597c7679ad8e11e72a84e4da1d72b01d2732f0d251c5f1dcb8656c86c60fc31f795cdd679f0d66a4053cb49529a
 DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
-EBUILD re2c-2.0.3.ebuild 762 BLAKE2B c2fcfe634b2d14fb089b4e12f5f83a8633139b9ab74f0d3061e6337a2bfa87b8a94c0af50cc2ea0740d5ca58296e8e40718d6f9abb39367111a02f6609422547 SHA512 f5382e054339ba6dc2d26fae690387fb3f4e049b10e877c66eb99644a1ddd6491ae428f3498060298d8c10deb5267e6772398809b456af117b8a06482a61c5c6
+DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf9a554b892e1f7f8b8d089e8dca58da347527c595881e1119344858694c133ba0f1676424914f6518adbf4f4 SHA512 13edbe961e0482677aff52ada93129500c10e134b579365f1d0cd180a898251f3060f1fe0597fc6c900c0ea29b1eb28fc2519b0ebfa2ed496a777bf7e138feae
+EBUILD re2c-2.0.3.ebuild 763 BLAKE2B 1be81406a67a3a0366e29d2708f1f79f9d9a2b3f5c23e54b1a7db465371b4cd95f2c0ce7b3ffc4bc1daf4eaeb8da1427e6f148a4f73ca315b2c5181e429da422 SHA512 463e2dccbd6d9efb36d739926d52836180155d7fe5265de9977fa735b016c0775af869b11c6f1d8efe4afce4d8417a425e07f84b081270df367cfb941a140bd4
+EBUILD re2c-2.1.1-r1.ebuild 810 BLAKE2B ae305b4aba9f7450d415504b4fbd535a506aa7cc2dd559e55ab0063d6ef6dddfd78af7f8b6bf91a21a69e7f3c463ec7a0ac0a13fdad49f02be8602a171f07523 SHA512 0a9146f9ba5ffb6237f2a8356209aa8edfc3f859fcab32326efdf38b73e02240073b4ef785832cf48d469a506d8b4ecdcebdaa1b48dcff96ba92a0aae756c321
 MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
diff --git a/dev-util/re2c/files/re2c-2.1.1-sh.patch b/dev-util/re2c/files/re2c-2.1.1-sh.patch
new file mode 100644
index 000000000000..7caa5d7d1a00
--- /dev/null
+++ b/dev-util/re2c/files/re2c-2.1.1-sh.patch
@@ -0,0 +1,48 @@
+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/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild
index a556857c71d9..6057a230e385 100644
--- a/dev-util/re2c/re2c-2.0.3.ebuild
+++ b/dev-util/re2c/re2c-2.0.3.ebuild
@@ -9,7 +9,7 @@ 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 ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_configure() {
diff --git a/dev-util/re2c/re2c-2.1.1-r1.ebuild b/dev-util/re2c/re2c-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..76f85099676e
--- /dev/null
+++ b/dev-util/re2c/re2c-2.1.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+PATCHES=("${FILESDIR}"/${P}-sh.patch)
+
+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
+}