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

4 files changed, 8 insertions, 136 deletions

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 2c3fd2dff91f..c5a3ce83f98a 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -6,8 +6,6 @@ DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c
 DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833f90fcb63c7f6c293a73a70ba057995426ba789d237c61dee5e3aa1ab53ec3193bd31c9c4b994193910219d13 SHA512 effa7021f5ce854ab9d2346c6cd8105ad6cbcbbbf59023c9cc704dc9720969221c9eb1e2c776063fcb6375900d457183f63892505615a878fc52c0f238f6921c
 EBUILD ragel-6.10.ebuild 806 BLAKE2B 4ae6940e77e31c1138865526016284ebc46eac20ed13b5ce0cc0aefb172aa00bec2167be6c15935771c9e38b975d00f162fa4038023cbdcaa06431aac42195b7 SHA512 fcdfc926252384856cf7b8dcc7ed573273c14c9ae2f787b61d3fb764ffa12a2927bda6c5f42a790927d8e79e2fc9acfd59c7fe1ff23cfb852f5e3b914a6ab531
 EBUILD ragel-7.0.0.12.ebuild 772 BLAKE2B 97dc91562f31eefe83292cef36885fa5562039e16e866b3456d5f4ff603d456fdc66423f809e02e0414ba9e14b60bb89173301b060352f9f02c161344463882d SHA512 ee3579c12527cabd3bbb25be5b3968fe88d0d7f6351cbdaeae50626ed689d6f8e4bb207090c3504f54f2da28bf2e4c399f816295fa20e518d6f7f8046d9f9ac3
-EBUILD ragel-7.0.4-r1.ebuild 1513 BLAKE2B 9e320220f920e3bfb3ee0a20ddb4691a33409822a209709af69d2a355fee036a7cf45dd9b7d503c04c1de1f0da96e0fa6b51150dfc4f292d24119c9cdabc5a5f SHA512 c97827ddaf1b23d5a236e295b6325354623421d261034aee7a8d6adc7d635f264ca0c9c9ed0695c93f2514d0016baaefc5c3ad9f2941fab954db39e7945d322b
 EBUILD ragel-7.0.4-r2.ebuild 1587 BLAKE2B 8a7c010db96fd3a397bfb0274f4775149480ee803fd84da161611864674104b22316fad607d22d7be509f57765fe57795c88d010fefcaffead2bf2c07d2966aa SHA512 55d2630e89cb5e2bea0f9f85a8a2cafade44b9caff7e50acec7ff35e30abacebeb8310b5739321ef677ebc23992bdc08ccaeb41eee4950eac5a12f2d57cce082
-EBUILD ragel-7.0.4-r3.ebuild 1605 BLAKE2B 360c1ebf1052c161880954a5d116e6d6f8319bbaabae08dfd8f38d363849fd07e2eaa22816fa673a9e58f007926167dd4ed49a208fec3d79551dd87b12324756 SHA512 1ab8b80d4ecf727fa396e20f07e5e14d4529eb46f889da376a324b9e5454c61de9f516b47c7459f04d00ba32acb4c5925a31397ed5065a1129eff10c660db9b5
-EBUILD ragel-7.0.4.ebuild 1509 BLAKE2B 5d794e6d621df74b906bf713d2dcc73f30f7f0ed92ec22155e3e9871294f703b1bd11d65ab4703c7dcbb15f20fbb9819c5a23115e1ac612cc6546501db14073d SHA512 87917e425cf5b43f533aea6626fcb0174232146b167abd9f7ea2473eb6d8c1d1df3f0a974e883e41e2a84767a5f57c22cbe610a524c1aba37d8f3bc77b6f19d8
+EBUILD ragel-7.0.4-r3.ebuild 1762 BLAKE2B 1e5e848727b0752cddb4bc3b5a7786dd4e33626b4745659aba9d8209b6298cf05954cb2d4151c8c49b2e0ebed30d8b81018985a7d05082c62e6bad215c01973e SHA512 577af062c918b19e76cd1fe8bee6c5b4726c27884988c2962c9219e05d31537e69255b3b9bb830ca947a12abb1de04057814f0e3a250fc9c9ed2f9b0e2b43a53
 MISC metadata.xml 305 BLAKE2B 47362779057e51875e2327cb9e1e71db670cf09828b9750ab1558c4160f1938250c3b61b6c9383584c559c276966bdcb5297c0df963e80873cecce749ea886ba SHA512 71acd92aed56e6b79b31d6bb889fbb3586fb9ff9ce4d2fa0c2f3ae68be9ea2cdd865c7adbd4757c3ae4d5ef462f3cf470bf52b696c7133a5f57da69014a4c897
diff --git a/dev-util/ragel/ragel-7.0.4-r1.ebuild b/dev-util/ragel/ragel-7.0.4-r1.ebuild
deleted file mode 100644
index e3842b3d827d..000000000000
--- a/dev-util/ragel/ragel-7.0.4-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv ~s390 ~sparc ~x86"
-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-r1"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-drop-julia-check.patch
-	"${FILESDIR}"/${PN}-7.0.4-link-colm-properly.patch
-)
-
-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
-}
diff --git a/dev-util/ragel/ragel-7.0.4-r3.ebuild b/dev-util/ragel/ragel-7.0.4-r3.ebuild
index 4f1a3096a21c..7de8c2fa21d1 100644
--- a/dev-util/ragel/ragel-7.0.4-r3.ebuild
+++ b/dev-util/ragel/ragel-7.0.4-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
+inherit autotools flag-o-matic
 
 DESCRIPTION="Compiles finite state machines from regular languages into executable code"
 HOMEPAGE="https://www.colm.net/open-source/ragel/"
@@ -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 \
 		--with-colm="${EPREFIX}/usr" \
 		$(use_enable doc manual)
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
deleted file mode 100644
index 00d0e8a15df2..000000000000
--- a/dev-util/ragel/ragel-7.0.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-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}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-drop-julia-check.patch
-)
-
-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
-}