gentoo resync : 22.01.2021

7 files changed, 68 insertions, 89 deletions

diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 99ae86a7d991..4965eeb93af1 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1,10 +1,5 @@
-DIST colm-0.13.0.4.tar.gz 707983 BLAKE2B a6b03f24ebe8bf44dbb17b6bd3f545a33b58883fae403d927cd30a81dd2376ae0fd4271c308008d64865697e63cb7cc988465c28b22e56c2136cbd533b32e999 SHA512 4684a315f3fef7cd6ff0982e357b59b110c02dfc2ce00a207d5d16dd9475f41790f3cfec9ddb5347d20da879cb0beebc03d3c56c325ce2ef22438555fcf60402
-DIST colm-0.13.0.5.tar.gz 736026 BLAKE2B 75fb1748495ead2ac5527ce040efb76de264e10b6562c4af734735f5aa25f53fc12260cbe52f019ff04c5117155aeb96358771f20b3e02012639a08527a54d98 SHA512 c5a1228260327d65c2cb5821fbc583608e2a308927b04cb0e7dbc84bced60d0d62892b4e30aa2228fee0d08f6828dc58d88788340433bc5bba9d503977883fc9
-DIST colm-0.13.0.6.tar.gz 739981 BLAKE2B e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 SHA512 5bcf2d7ff78e523385294f338a8c057807b416b2922e002311fcd8027132504f1aa99bc4dde2c4ea7ddbbc8806fddefda57f8a16f6d5c91a9c47566f86339c81
 DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
-EBUILD colm-0.13.0.4.ebuild 369 BLAKE2B 14ff1f1c4734a24f425a509d5c052a9a1d8ec2acaf968364a0a6cfd94444ae32a2cbe9ee3d03a180c5f1be0431388730fa297351955a034bcbd514f11d6b443a SHA512 888e99986f172f6288617fbb4bd9220cd0b57824b064a48c521e59303d243f4e76a2a9e3ccbedfffc3c10d654e4860f7998712cb35c1c82504f7e544ecd1d3f1
-EBUILD colm-0.13.0.5.ebuild 493 BLAKE2B 1db4cd9d96b82533efaf02912860354d02afadc9db9efcd753717fa8640c31fa23b375cdd6db8d87872accf1cf89931a73f76ec454fb435d2ac6c3aec08d5b1d SHA512 78358f795c3344b0705c9a50906696781dc835c8b600f8dc2fe3c64e5f3451329405dc3cd1496893059b2d09f9f49f261f497c370a674840713d7d7459a47793
-EBUILD colm-0.13.0.6-r1.ebuild 495 BLAKE2B da89d4c288e2fac01b749a1021722d1a8e20d9ab2d9665a34b88d3711d7adeb080e16e8dcbed189ebf61508ecf595b5cd01411febc652a79f2e2689280c3d701 SHA512 f041d1089febd167ea240289d0c8e1876a74093204d3a866310ec4547a274ba4015a04f8329fcaf0d7df9f10ae362badbe18f04858a0fffbf675fcf4fdae1b63
-EBUILD colm-0.13.0.6.ebuild 390 BLAKE2B cdc09b52c1787783cfe49fe1361559b0c5317d9ce9db7b0116f393fd818c17027b257685b15ee06e0cdc7fc3d9779e977dcd97d88ba63306c8cce5dd2bb1ca4d SHA512 1943cd5be8929df9a5c119a7cc9362ba1936440fc2fd77f3a80b1c94e5107709af590987dc32067cdfbea0daf9486e235bdbb3c7035c1bcdc2b57731a536302a
+DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf2879ac3780fa6ebbc37bed30d3faf68515f21c9b31bd5f1504ab03b5ea63a24812f7117515c63261b8d1683e27 SHA512 a783817f9d348a79e93cac54c042e8366a73df287c14221b9e4a7b963385c1e32eb54d6918d0822b271dc2a0420abce84a3e1a3c9ada84968d1c20178d0310ad
 EBUILD colm-0.13.0.7.ebuild 535 BLAKE2B a9b324dd50e8e13801761d36b776c7fdb3003e8c078201ae371106d54476abe7373f6010a444d00cff10978c5025d42b898f7596089c933eabd96af6294135ef SHA512 81eaf1b0b0b38e3e6612e94ab88cb35570df633ec20a81f268f23312995a2477881ea8ba230a5891ebb8bb7ead324b086209db043e98083ca08526c38791d9de
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
+EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
+MISC metadata.xml 332 BLAKE2B e0956073a0eac90ffbe6c682e223262351704d19f4ab914435d5751b88386b8197c72c5a77e6eefa410b009b8da4a479d9eede17a26f7faa5f4baf94ae6773b2 SHA512 cc81ab9d4d382d80a02de1073fb5f9a0f793cc3df7b5a11bbba63d5a9727c282e88365c265256d0452f5627a2fcd41551e02ab395cab1be9734765d651b223f6
diff --git a/dev-util/colm/colm-0.13.0.4.ebuild b/dev-util/colm/colm-0.13.0.4.ebuild
deleted file mode 100644
index 3226a9812423..000000000000
--- a/dev-util/colm/colm-0.13.0.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-util/colm/colm-0.13.0.5.ebuild b/dev-util/colm/colm-0.13.0.5.ebuild
deleted file mode 100644
index ec66f5a78c62..000000000000
--- a/dev-util/colm/colm-0.13.0.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="app-text/asciidoc"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/colm/colm-0.13.0.6-r1.ebuild b/dev-util/colm/colm-0.13.0.6-r1.ebuild
deleted file mode 100644
index 24c79169a62c..000000000000
--- a/dev-util/colm/colm-0.13.0.6-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="app-text/asciidoc"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/colm/colm-0.13.0.6.ebuild b/dev-util/colm/colm-0.13.0.6.ebuild
deleted file mode 100644
index 4292b617eac2..000000000000
--- a/dev-util/colm/colm-0.13.0.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-text/asciidoc"
diff --git a/dev-util/colm/colm-0.14.6.ebuild b/dev-util/colm/colm-0.14.6.ebuild
new file mode 100644
index 000000000000..827e3f051e77
--- /dev/null
+++ b/dev-util/colm/colm-0.14.6.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 ~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?)
+}
diff --git a/dev-util/colm/metadata.xml b/dev-util/colm/metadata.xml
index f3de5f693ed8..eb7ab1205961 100644
--- a/dev-util/colm/metadata.xml
+++ b/dev-util/colm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">adrian-thurston/colm</remote-id>
+	</upstream>
 </pkgmetadata>