gentoo resync : 03.03.2021

2 files changed, 60 insertions, 0 deletions

diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 4965eeb93af1..8bc6c9f03a1d 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1,5 +1,7 @@
 DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
 DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf2879ac3780fa6ebbc37bed30d3faf68515f21c9b31bd5f1504ab03b5ea63a24812f7117515c63261b8d1683e27 SHA512 a783817f9d348a79e93cac54c042e8366a73df287c14221b9e4a7b963385c1e32eb54d6918d0822b271dc2a0420abce84a3e1a3c9ada84968d1c20178d0310ad
+DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 535 BLAKE2B a9b324dd50e8e13801761d36b776c7fdb3003e8c078201ae371106d54476abe7373f6010a444d00cff10978c5025d42b898f7596089c933eabd96af6294135ef SHA512 81eaf1b0b0b38e3e6612e94ab88cb35570df633ec20a81f268f23312995a2477881ea8ba230a5891ebb8bb7ead324b086209db043e98083ca08526c38791d9de
 EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
+EBUILD colm-0.14.7.ebuild 1229 BLAKE2B 634930937f2ed2c7aa86cdd024ee418bd498d3e0011a94d6c3c35c3ff14f37247e6d7a494981bba8287500c6a54dee08f531c99f3d8bc296ec43d50094c3d6fb SHA512 3d9683ce7d5ba6746258ff6c7cb8767c9964d10f98558f199d183964da69a8a23a2a401677c9cef5c786d05bf7babd604d1beacfbc51cf8b7a80588d4d31896b
 MISC metadata.xml 332 BLAKE2B e0956073a0eac90ffbe6c682e223262351704d19f4ab914435d5751b88386b8197c72c5a77e6eefa410b009b8da4a479d9eede17a26f7faa5f4baf94ae6773b2 SHA512 cc81ab9d4d382d80a02de1073fb5f9a0f793cc3df7b5a11bbba63d5a9727c282e88365c265256d0452f5627a2fcd41551e02ab395cab1be9734765d651b223f6
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
new file mode 100644
index 000000000000..e4a3be51e8ec
--- /dev/null
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="https://www.colm.net/open-source/colm/"
+SRC_URI="https://www.colm.net/files/${PN}/${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"
+
+BDEPEND="
+	doc? (
+		|| ( app-text/asciidoc dev-ruby/asciidoctor )
+		dev-python/pygments
+	)
+"
+# libfsm moved from ragel -> colm, bug #766108
+RDEPEND="!<dev-util/ragel-7.0.3"
+
+src_prepare() {
+	default
+
+	# bug #733426
+	sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], [asciidoc asciidoctor]/' configure.ac || die
+
+	# bug #766069
+	sed -i -e "s:gcc:$(tc-getCC):" test/colm.d/gentests.sh || die
+	sed -i -e "s:g++:$(tc-getCXX):" test/colm.d/gentests.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable doc manual)
+}
+
+src_test() {
+	# Build tests
+	default
+
+	# Run them
+	cd test || die
+	./runtests || die
+}
+
+src_install() {
+	default
+
+	# NOTE: dev-util/ragel needs the static libraries
+	# and .la files, unfortunately.
+	# (May have better luck if we use the CMake port?)
+}