gentoo resync : 12.05.2022

4 files changed, 77 insertions, 8 deletions

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 1fd28a00d951..c77a20206f65 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,12 +1,12 @@
 AUX ragel-7.0.4-drop-julia-check.patch 1309 BLAKE2B 27855c17b9f1714aa17fe2fca7160ec1efa7b7044032c39b65e56529e2d8475885384e8b33ec2924e98cc1c340dc5e284a827665b8df63b54cbf56ca9e2574cf SHA512 9144e4118b7bcd5a86af6cff96bad861e3aaecc73efa9a29a001edd172943828629fa7f2f976cfbc2a5cef9899fb9f3025aea472f83b0d4970abc1284ddfa512
 AUX ragel-7.0.4-link-colm-properly.patch 1295 BLAKE2B 1439e05a69f3b652abdf3a1213706dd8151654f29d916d024e7a68ddac4d77de1c5d50f1dee966ff2b79b5851617bec5e98db689a17f68dd1b18e009bea5f14a SHA512 6fa2a691327ef119b22609784c60658b3f09cda37badaf86036f1fa5c13b5d40f84a361edf83fa17d54ca4a11434dab5e037582fd80b2ef659af14418bc8c6e2
+AUX ragel-7.0.4-r2-link-colm-properly.patch 1639 BLAKE2B a6c1aecbe52095b9853209271a49c59b7224c05a1afec1787daf51f8c4f765763a6312337dcd2707820fe3ea9813929deb8b28b53756cc24205522478b489cb5 SHA512 87ccd8ecd1274c4f21f6865e88609c5b8891bf89ab07e475ffbfc3b13b8dd74939161f6c12a3cf95530ab438068c58b2ae2593300d2ecb3f4670520af984a3eb
 DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38
 DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759 SHA512 32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
-DIST ragel-7.0.3.tar.gz 1656577 BLAKE2B 3a9ce560894714a3801039fb944d3c914f2647a0b76bba4a7b790f8d569eb2e9eb807ab4d8af067560b274692be2d98c5dc28632e11c853893971585e847d48e SHA512 16bcb4b44a3ca94918d6c3e4bce468620cc691bf74cb69f0a264c41cbcffd595f897aa18e300952b60a68e680e1223532bbf9e500168d35d92a6559c190f6e78
 DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833f90fcb63c7f6c293a73a70ba057995426ba789d237c61dee5e3aa1ab53ec3193bd31c9c4b994193910219d13 SHA512 effa7021f5ce854ab9d2346c6cd8105ad6cbcbbbf59023c9cc704dc9720969221c9eb1e2c776063fcb6375900d457183f63892505615a878fc52c0f238f6921c
 EBUILD ragel-6.10.ebuild 844 BLAKE2B 9b0fff510885955ce828fe02f29918cc42cbfc23f3220755e7b2f96f78eaf3bf2b10f7d8f64ebdf7c9f946074046e275776c690aeb04eb21f22a93293ec94737 SHA512 33c796fbcad69094b021e17188e9d6df28a2f7f1b21019c5cfdf586e7003b73263a9af4c48b7f84596f684fe89700274a72effeee52e4ba533a0faa5e8f22a0c
 EBUILD ragel-7.0.0.12.ebuild 772 BLAKE2B 97dc91562f31eefe83292cef36885fa5562039e16e866b3456d5f4ff603d456fdc66423f809e02e0414ba9e14b60bb89173301b060352f9f02c161344463882d SHA512 ee3579c12527cabd3bbb25be5b3968fe88d0d7f6351cbdaeae50626ed689d6f8e4bb207090c3504f54f2da28bf2e4c399f816295fa20e518d6f7f8046d9f9ac3
-EBUILD ragel-7.0.3.ebuild 1416 BLAKE2B 817cb6f863af04d4c635f86e70ae296f077d07801a5e6fed4d868fa5558cb033b00538c789644a4eda9f6b75fe12c89afa1f4a904579d81728c7d115a3453008 SHA512 c34c6e7c3faab0aad54aec9cbe1b753373590d48d4dfc6e0853815e92375209507263d6071896a5bb748089a986dba90c3c9b47af5568baedcd3ee68bfd48887
-EBUILD ragel-7.0.4-r1.ebuild 1513 BLAKE2B c5b68326de2f45040942b815e6f0fc4d7934c37299779094893033088587db439e72d7ed8a993d7f59c36aa93bbd201fc75cbe61c568b5b06152e638bc343def SHA512 19cf49f798760c2d349d1ab303cc70e97baedd0c6f3d0b6bdcebb842f8185a06acd4a183d4a3a9a15020a86a9c7e47a2487e9ece336a6fd6a6401816e47f2e1c
+EBUILD ragel-7.0.4-r1.ebuild 1513 BLAKE2B 9e320220f920e3bfb3ee0a20ddb4691a33409822a209709af69d2a355fee036a7cf45dd9b7d503c04c1de1f0da96e0fa6b51150dfc4f292d24119c9cdabc5a5f SHA512 c97827ddaf1b23d5a236e295b6325354623421d261034aee7a8d6adc7d635f264ca0c9c9ed0695c93f2514d0016baaefc5c3ad9f2941fab954db39e7945d322b
+EBUILD ragel-7.0.4-r2.ebuild 1523 BLAKE2B b23c97d905d2ea5aac5fa9c63049f164219ff1b22265c326e18f2d5a6c57ef56c1291574d518e40ac98e53125ecfbeccf593785356462c392be936a41d79215c SHA512 0aeaa4c21cacdb2307d86a31f648c0239acc10daf2e093c405ef6614884b4b4b620f80fed36510fe9704011ffc882165a36d907b01965ea7c2df92e5bb5e0f3c
 EBUILD ragel-7.0.4.ebuild 1554 BLAKE2B ca94d9ec683bb204a0370dce71d57ff877dcd1d45a9c3b1d18571623c5125fe0d4c83aedd7086a50d64b63f25e35d32870d74e314b9ceee276ddeae9fe33ef4b SHA512 a20e53b945f896184491bc0ab9a07242d62190455abacab8844adad462eff4a348306ae729b262e56b34a5112c7be921079024b1568d24c7ab43ca2d0df2af11
 MISC metadata.xml 305 BLAKE2B 47362779057e51875e2327cb9e1e71db670cf09828b9750ab1558c4160f1938250c3b61b6c9383584c559c276966bdcb5297c0df963e80873cecce749ea886ba SHA512 71acd92aed56e6b79b31d6bb889fbb3586fb9ff9ce4d2fa0c2f3ae68be9ea2cdd865c7adbd4757c3ae4d5ef462f3cf470bf52b696c7133a5f57da69014a4c897
diff --git a/dev-util/ragel/files/ragel-7.0.4-r2-link-colm-properly.patch b/dev-util/ragel/files/ragel-7.0.4-r2-link-colm-properly.patch
new file mode 100644
index 000000000000..82ff98b5a15e
--- /dev/null
+++ b/dev-util/ragel/files/ragel-7.0.4-r2-link-colm-properly.patch
@@ -0,0 +1,64 @@
+From ad49af2601018298478af6ea6f8ae0ce323d7b28 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 4 May 2022 10:23:51 -0700
+Subject: [PATCH] Fix build without .la files
+
+Many distros do no ship .la files which breaks the build
+and additionally when using slibtool instead of GNU libtool
+the .la files are not installed by default.
+
+This fixes the build to use the linker flags -lcolm and -lfsm
+instead.
+---
+ configure.ac    | 16 ++++++++++++----
+ src/Makefile.am |  1 -
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b3a5b4b..9cee5e5f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,16 +44,24 @@ AC_ARG_WITH(colm,
+ 	[
+ 		COLM="$withval/bin/colm"
+ 		COLM_WRAP="$withval/bin/colm-wrap"
+-		CPPFLAGS="-I$withval/include ${CPPFLAGS}"
+ 		CPPFLAGS="-I$withval/include/aapl ${CPPFLAGS}"
+-		LDFLAGS="-L$withval/lib ${LDFLAGS}"
+-		LIBCOLM_LA="$withval/lib/libcolm.la"
+-		LIBFSM_LA="$withval/lib/libfsm.la"
+ 		COLM_SHARE="$withval/share"
+ 	],
+ 	[]
+ )
+ 
++AC_CHECK_LIB(
++	[colm],
++	[colm_run_program],
++	[LIBCOLM_LA=-lcolm],
++	[AC_ERROR([libcolm is required to build ragel])]
++)
++AC_CHECK_LIB(
++	[fsm],
++	[hostLangAsm],
++	[LIBFSM_LA=-lfsm],
++	[AC_ERROR([libfsm is required to build ragel])]
++)
+ AC_CHECK_FILES(
+ 	[$COLM],
+ 	[],
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c4fe531c..377f7aa4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -39,7 +39,6 @@ nodist_ragel_SOURCES = \
+ 	parse.c rlreduce.cc
+ 
+ ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+-ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+ 
+ BUILT_SOURCES = \
+ 	version.h \
+-- 
+2.35.1
+
diff --git a/dev-util/ragel/ragel-7.0.4-r1.ebuild b/dev-util/ragel/ragel-7.0.4-r1.ebuild
index 48a3e7cfcf0b..e3842b3d827d 100644
--- a/dev-util/ragel/ragel-7.0.4-r1.ebuild
+++ b/dev-util/ragel/ragel-7.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/ragel/ragel-7.0.3.ebuild b/dev-util/ragel/ragel-7.0.4-r2.ebuild
index a411580fcd79..09a0667fa6bc 100644
--- a/dev-util/ragel/ragel-7.0.3.ebuild
+++ b/dev-util/ragel/ragel-7.0.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc"
 
 # Notes from bug #766090
@@ -29,9 +29,14 @@ BDEPEND="
 		media-gfx/transfig
 	)
 "
-DEPEND="~dev-util/colm-0.14.6"
+DEPEND=">=dev-util/colm-0.14.7-r1"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-drop-julia-check.patch
+	"${FILESDIR}"/${PN}-7.0.4-r2-link-colm-properly.patch
+)
+
 src_prepare() {
 	default