gentoo auto-resync : 29:02:2024 - 11:41:17

5 files changed, 8 insertions, 197 deletions

diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index ea1d17efcbe7..c3611b7ee13c 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -4,8 +4,5 @@ AUX colm-0.14.7-solaris.patch 659 BLAKE2B f7e8b4781ffc7a63fa63ee83f69e115ea14609
 DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
 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.7-r1.ebuild 1503 BLAKE2B f95c5748f050f0ac7a8b41adf5e3b4a590eddee19c630bc17c4588900ea7e1aea4c5983304ef160f9ff76e091bebcdbe89b8196221928764dd7ede3b5c8cb5ba SHA512 ddc499fea7d5373187485d72b64cff57aff1f440586f3449c5c8817ff60cdf41017a8bc89320b2cc15eec0bcbb98a6aa903638740b2a087f863d36653b7ffdf2
-EBUILD colm-0.14.7-r2.ebuild 1581 BLAKE2B 377242d76cbe1274af3f21b9ccb29a9c2f1288641c301abe4bdceab926fc2b059aad930a36f4334a378e7355471400929a67a0a849d81296a62627e5050dd0c5 SHA512 65c5e21ba9b0810a8db75cf2d95e3407df11c1eaa3104151c45ef39096cc6dd5040fc0c6f56ffde570aef19542941ab66c4d74f4ede5d996fec671f372248a64
-EBUILD colm-0.14.7-r3.ebuild 1717 BLAKE2B ee2df2706c9d25e3d4cdfd991e96c07618b23ef3f4f2401421c72ed1c89ef3ab6b6e406222f233504e10c2b5d74dab743063369e2d93b7dc115582478d0d160e SHA512 f9ff7c523a1aa38a7aabaff613a97d86b4d980a5d54a99a244f3a4be6ab5f10472f31a22b848a096e3cee9960456cc355c2be84ba6629e071f24a4d571fa2c0c
-EBUILD colm-0.14.7.ebuild 1337 BLAKE2B e1d3a148fde56949359e273b2b03388848915224cc403d2f4b2845eb69dd7a6cbb6916d54d15877d8acae2bf9c746d84cb16938ea77b638dc4cf116894f2ced9 SHA512 f2f214e362323bbce9f8b497a07c3b2f5440d997023538853276f8167aeac56c466d026950603a8ac54ed13d9f1516c6edf8308376b303e44ca550f422b33293
+EBUILD colm-0.14.7-r3.ebuild 1874 BLAKE2B 35de4db73c5a63b34f0b6080cf0e3d003806617fb9f134e664fd74043402b8387965e4246823f3c38f281f3154656f5411473234f6f17c5897d1e12b9a768fa0 SHA512 1b4a33193b5db6bc332193ae214b4fb42147d814a38a5689789b1c03d0a37640ed48c6e802ddf6ee53d857715923ec06d65d2713d03f944760f21f57d3ca46e6
 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7
diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
deleted file mode 100644
index cebc2bf2ea2f..000000000000
--- a/dev-util/colm/colm-0.14.7-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
-	"${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch
-	"${FILESDIR}"/${PN}-0.14.7-solaris.patch
-)
-
-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) ${CFLAGS}:" src/main.cc || die
-	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
-
-	# fix linkage on Darwin from colm itself during build
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/libcolm\.so/libcolm.dylib/' src/main.cc || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable doc manual)
-}
-
-src_test() {
-	# Build tests
-	default
-
-	# Run them
-	cd test || die
-	./runtests || die
-}
diff --git a/dev-util/colm/colm-0.14.7-r2.ebuild b/dev-util/colm/colm-0.14.7-r2.ebuild
deleted file mode 100644
index 229accae747c..000000000000
--- a/dev-util/colm/colm-0.14.7-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
-	"${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch
-	"${FILESDIR}"/${PN}-0.14.7-solaris.patch
-)
-
-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) ${CFLAGS}|" src/main.cc || die
-	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
-
-	# fix linkage on Darwin from colm itself during build
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/libcolm\.so/libcolm.dylib/' src/main.cc || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable doc manual)
-}
-
-src_test() {
-	# Build tests
-	default
-
-	# Run them
-	cd test || die
-	./runtests || die
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-util/colm/colm-0.14.7-r3.ebuild b/dev-util/colm/colm-0.14.7-r3.ebuild
index 434617e07dbd..852300e4e897 100644
--- a/dev-util/colm/colm-0.14.7-r3.ebuild
+++ b/dev-util/colm/colm-0.14.7-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="COmputer Language Manipulation"
 HOMEPAGE="https://www.colm.net/open-source/colm/"
@@ -51,6 +51,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# We need to be careful with both ragel and colm.
+	# See bug #858341, bug #883993 bug #924163.
+	filter-lto
+	append-flags -fno-strict-aliasing
+
 	econf $(use_enable doc manual)
 }
 
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
deleted file mode 100644
index 352487813ce5..000000000000
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-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 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
-)
-
-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?)
-}