gentoo resync : 12.05.2022

3 files changed, 2 insertions, 62 deletions

diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 13e5bd6fe3f7..1087567290d9 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -2,10 +2,8 @@ AUX colm-0.14.7-disable-static-lib.patch 524 BLAKE2B 1e47e8e48592956b4aa99682398
 AUX colm-0.14.7-drop-julia-check.patch 1369 BLAKE2B 9d2e841fd19051e0617df64fb9940b5552e7b0a1c7d3525606e022b1f483628847955c2c85e7ac6d3fbedb85e46b38573b054b9883ca31a327180fcae261bf06 SHA512 962174b04c0f694c655e5e5c526ffe82619abbe12457d3a396dd639f023e36a8750d166c0b09b7531cb03abd0a8619587201d66ce46e69d2d4e7420f883771ca
 AUX colm-0.14.7-solaris.patch 659 BLAKE2B f7e8b4781ffc7a63fa63ee83f69e115ea14609e1665a01e0ad62d9716a1258d71ab849f02b58b3dcd40fb8d6cb30a9beb0e587a3825fadde4d9ca45e124adcb9 SHA512 cd4e6a8d7aca33112e3f7c936b018392923e8578050a437c13e818d4bec8979b5f0c3f8792dcc451a4ac6c990f7498b9026aefcb22d91db0d61c1bc01287300d
 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 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
-EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
-EBUILD colm-0.14.7-r1.ebuild 1464 BLAKE2B 42a1241adf2e34160d294c104a6fe06550b001ad51d1694ed6a665373284e2eb25db7012772823405304f6531184b4a93deca6cc086247913d74b554f327dd88 SHA512 07841441e7eee4dcc2567d7096af022d25b63a381608f5849f6d79a8b7aaabcae82eabe5b75fe90dd3abcb201c85ba2985b1991781d3386a4b46105c8b242096
+EBUILD colm-0.14.7-r1.ebuild 1471 BLAKE2B 42782595e7696cceb1fa894287a31936b19ba6b7dce0a0e7ee996d2a98faefd7bf5d326d29b0f251b97a39cc1c9395b385708d4e33a2b94891fea7a7db06c163 SHA512 8ed5e69698945e86924cc0a79c19cc3903e079cde8f706b8522d2cdffec935500bc3811d5c05fabad7790ed372f8569b0bd3c29e92b2dec51f671c1d1e0a00a0
 EBUILD colm-0.14.7.ebuild 1366 BLAKE2B 443e26f0bad0e8805d20ce2a69cb829d28e5558fedeee3e3a76b74e1c73bf4dea37ec391f9e2615c91581576297cfc37865cdd4cc9dab8870bf4a4634da50b9f SHA512 58af643e63bdb8261b36c4141b9b680f3d27647394b40c0fbfcf1c5f9c261f44277d17dd98e58db7aa697cfe6d5ea66260e1adbfced1c45e35fb7b7335dd4b83
 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7
diff --git a/dev-util/colm/colm-0.14.6.ebuild b/dev-util/colm/colm-0.14.6.ebuild
deleted file mode 100644
index 827e3f051e77..000000000000
--- a/dev-util/colm/colm-0.14.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
index cccddd15cee0..eda6d30f5d36 100644
--- a/dev-util/colm/colm-0.14.7-r1.ebuild
+++ b/dev-util/colm/colm-0.14.7-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="