gentoo resync : 03.09.2021

3 files changed, 119 insertions, 0 deletions

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 99038a59a4f4..5755e6597de9 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,4 +1,5 @@
 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
 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
@@ -6,5 +7,6 @@ DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833
 EBUILD ragel-6.10.ebuild 837 BLAKE2B 797418aa818b3dc163611d057c6c2d348b716945ca1632ef93e7c1183429c57bc9150a4c1ba594b751b53c0473d9066d056dbf4bbed75b962cd35c331f3b0c22 SHA512 243802350f28a11f6fa8e194e7562e672d4121b3e45632e09551569dc30594672afbde8e8ca1faa51d9c7d4aa71053ca9d389ea8994244d9399922ce3689c541
 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.ebuild 1554 BLAKE2B ca94d9ec683bb204a0370dce71d57ff877dcd1d45a9c3b1d18571623c5125fe0d4c83aedd7086a50d64b63f25e35d32870d74e314b9ceee276ddeae9fe33ef4b SHA512 a20e53b945f896184491bc0ab9a07242d62190455abacab8844adad462eff4a348306ae729b262e56b34a5112c7be921079024b1568d24c7ab43ca2d0df2af11
 MISC metadata.xml 304 BLAKE2B e1fe70825ab2eaef1101ab15d8a29dfffae8b22e1a8cfdb9e97bd7243699be7bf5dff01735e9a9451f7e3207fd9659f7cad5492f1909e845c0761388b254a3fc SHA512 4c34ae1a571f693c06acd7b3611019f137e3b73796f982a0d054ce06402f8a27c44d18cf49c6e6758f010690f769a6b3a94fc46f972d38913140eb8392557f66
diff --git a/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch b/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch
new file mode 100644
index 000000000000..f5f12ec4491a
--- /dev/null
+++ b/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch
@@ -0,0 +1,51 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2021-04-27 18:22:18.718396764 +0200
+
+ragel just completely lacks a block to support system colm.
+
+---
+ configure.ac    |   14 ++++++++------
+ src/Makefile.am |    2 +-
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+Index: ragel-7.0.4/configure.ac
+===================================================================
+--- ragel-7.0.4.orig/configure.ac
++++ ragel-7.0.4/configure.ac
+@@ -51,14 +51,16 @@ AC_ARG_WITH(colm,
+ 		LIBFSM_LA="$withval/lib/libfsm.la"
+ 		COLM_SHARE="$withval/share"
+ 	],
+-	[]
++	[
++		COLM=/usr/bin/colm
++		COLM_WRAP=/usr/bin/colm-wrap
++		CPPFLAGS="-I/usr/include/aapl $CPPFLAGS"
++		LIBCOLM_LA=-lcolm
++		LIBFSM_LA=-lfsm
++		COLM_SHARE='${datadir}/colm'
++	]
+ )
+ 
+-AC_CHECK_FILES(
+-	[$COLM],
+-	[],
+-	[AC_ERROR([colm is required to build ragel])]
+-)
+ AC_SUBST(COLM)
+ AC_SUBST(COLM_WRAP)
+ AC_SUBST(COLM_SHARE)
+Index: ragel-7.0.4/src/Makefile.am
+===================================================================
+--- ragel-7.0.4.orig/src/Makefile.am
++++ ragel-7.0.4/src/Makefile.am
+@@ -39,7 +39,7 @@ nodist_ragel_SOURCES = \
+ 	parse.c rlreduce.cc
+ 
+ ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+-ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
++ragel_DEPENDENCIES = libragel.la
+ 
+ BUILT_SOURCES = \
+ 	version.h \
+
diff --git a/dev-util/ragel/ragel-7.0.4-r1.ebuild b/dev-util/ragel/ragel-7.0.4-r1.ebuild
new file mode 100644
index 000000000000..48a3e7cfcf0b
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/"
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc"
+
+# Notes from bug #766090
+# dev-libs/libxml2's xmllint ends up being called by asciidoc here
+# app-text/dblatex too
+# app-text/ghostscript-gpl too
+BDEPEND="
+	doc? (
+		|| ( app-text/asciidoc dev-ruby/asciidoctor )
+		app-text/dblatex
+		app-text/ghostscript-gpl
+		dev-libs/libxml2
+		dev-texlive/texlive-latex
+		dev-python/pygments
+		media-gfx/transfig
+	)
+"
+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-link-colm-properly.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix hardcoded search dir
+	sed -i -e "s:\$withval/lib:\$withval/$(get_libdir):" configure.ac || die
+
+	# Allow either asciidoctor or asciidoc
+	# bug #733426
+	sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], [asciidoc asciidoctor]/' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-colm="${EPREFIX}/usr" \
+		$(use_enable doc manual)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ragel.vim
+
+	find "${ED}" -name '*.la' -delete || die
+}