gentoo resync : 03.03.2021

3 files changed, 76 insertions, 13 deletions

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 689847ffb1c4..0aa0af4150b5 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,7 +1,9 @@
 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
-EBUILD ragel-6.10.ebuild 906 BLAKE2B 4e1fc1cae8a187e92165539dce7c276ca63dfdc6eefbc55ba5448c826095f4a9f745847ccee03e5c9867a6f02ec57abb6a4831d43ee7df1c0da530a3ffb53010 SHA512 cc2c877a6162d1ee5f29e58758833391e508566201256e2241261357a6c38a2bd6c281f64e6486293faaf1bb8be74c61f5bf458fa9e4d70b4f7a902e181b772f
+DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833f90fcb63c7f6c293a73a70ba057995426ba789d237c61dee5e3aa1ab53ec3193bd31c9c4b994193910219d13 SHA512 effa7021f5ce854ab9d2346c6cd8105ad6cbcbbbf59023c9cc704dc9720969221c9eb1e2c776063fcb6375900d457183f63892505615a878fc52c0f238f6921c
+EBUILD ragel-6.10.ebuild 836 BLAKE2B 2b3568650dc1e3d704ecc71b5be4439383d2a92cdd88fdda7173734f20fb4596bd7611e21634fc50538966995248f2a001c31202624b2c362a676551b7f57713 SHA512 15bd38b257f430bd222c1a280417854856cdbad78eac976c5e9d28fa2ce68d18d3d0db58d2f9534db7066f0c404f545a44ec6dc137c211be46c07ea7a35d8d86
 EBUILD ragel-7.0.0.12.ebuild 771 BLAKE2B fe5abe581ce0a9c8feccf4c9a86fd9cb258af68c7a3e6aeddcc4bf1f7cb3bf79a2c24951010204f5704efb8ef7d0194ad5f47f3a3dfac9275f38dcd7958d0fdd SHA512 94e28393676e525b0a8fda907c7aa22ce66586a2fa63a881a17f90280f2c2dfbd2b38ba9acb96efe0899efe81c37ed51989886464baf22ed139a4d426fb0b0ab
 EBUILD ragel-7.0.3.ebuild 1416 BLAKE2B 817cb6f863af04d4c635f86e70ae296f077d07801a5e6fed4d868fa5558cb033b00538c789644a4eda9f6b75fe12c89afa1f4a904579d81728c7d115a3453008 SHA512 c34c6e7c3faab0aad54aec9cbe1b753373590d48d4dfc6e0853815e92375209507263d6071896a5bb748089a986dba90c3c9b47af5568baedcd3ee68bfd48887
+EBUILD ragel-7.0.4.ebuild 1418 BLAKE2B edcc830673ce5bc339bbf2d7db97c81917468bdcd2a55b8550bbba918266ec963ed5ea8413beea96a196798b6f22de1130567ea97fa06c16181e7a54dac84aa8 SHA512 0b0551e7c7aa6171c0c09217c30eaef0cb072c13f2ebd275a66974f6e9e4307738dbc17a8cd0aa3370356a4cf6ac6fb9fe4b6fe58b3cf11a2a4c17e510ed6af5
 MISC metadata.xml 304 BLAKE2B e1fe70825ab2eaef1101ab15d8a29dfffae8b22e1a8cfdb9e97bd7243699be7bf5dff01735e9a9451f7e3207fd9659f7cad5492f1909e845c0761388b254a3fc SHA512 4c34ae1a571f693c06acd7b3611019f137e3b73796f982a0d054ce06402f8a27c44d18cf49c6e6758f010690f769a6b3a94fc46f972d38913140eb8392557f66
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 8c0d3bba3196..00b8d07df42b 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools autotools-utils
+inherit autotools
 
 DESCRIPTION="Compiles finite state machines from regular languages into executable code"
 HOMEPAGE="http://www.colm.net/open-source/ragel/"
@@ -12,26 +12,26 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
 
 # We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
+RESTRICT="test"
 
 DOCS=( ChangeLog CREDITS README TODO )
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_test() {
 	cd "${S}"/test
 	./runtests.in || die
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ragel.vim
 }
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
new file mode 100644
index 000000000000..c35e01e7be69
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+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"
+RDEPEND="${DEPEND}"
+
+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
+}