gentoo auto-resync : 01:03:2024 - 05:41:23

4 files changed, 52 insertions, 14 deletions

diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 95b33c20c5d5..a7faa666bbfb 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,7 +1,8 @@
+AUX 0001-configure-remove-terrible-horrible-code-that-resets-.patch 652 BLAKE2B fcdb30412aac32fedf324f5c0e549fa5c1acb7428b1e7f47d5fe8ffdb483735ca774fd53ded13d689d05edef156a0fcd7ea930c94b769e3a22c5d40f5dd32ebe SHA512 35fb155f08724a542142cdb138e11e93299abecf5f868c5b7311cfc3b1593941d30d8a0976f35c858af55fec0fadec1e87ea8c2ca3c2238fe0c8a7bec48cac31
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 AUX mecab-0.996-clang-16-binary_function.patch 532 BLAKE2B 74aafcdb73e954ca2c409c6644444f1039fae3cf652bdfd16e1c2306c884dab7d22243303db7308a53933621bf4f0f81045c816ae9feff6776010651ed96a652 SHA512 d5cfbd9e419883a8f87d0409392a217bc5e93ea6d16d413b3ffff2d662c70170a5075b36cd3a8178c57753f9e511e9fcfa189d5321cb60735432d967a5c664d7
 AUX mecab-0.996-clang-16-register.patch 3285 BLAKE2B ce5fc8bb953c617ad614216949e96961e264b588a34269495082bc44fe89c23bef06cc42c39579ca02004fa923621c32b859e481c7b09d87a065df49a539f662 SHA512 e79c294bf29c1bf5cf356aa70461000f0ed999c43d0069ae95716bb4fea5280f2415f911828b7510b114ad7952247dd68bbffacfec65dcbd77b22f8fc2a2d662
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996-r1.ebuild 1266 BLAKE2B 9fd202ec8988294d00cefb3cf5a17f45aacb306c8ac308f4c3f775a2ef2c33c64107993784481c545f829110e00c6f1aecf4ca69d746c519d166de634dbac1a1 SHA512 909e9336e764789c9aa9a8bb6d51095b0719e8c7b240529539615be3836e350133450eb6934815cf20d00fb30ec2cbf8f867c20cba3c5145fef3834ea7bc3598
-EBUILD mecab-0.996-r2.ebuild 1331 BLAKE2B f1cdbb10dad1f31e957bb086e5ddbb6c24a2c045e65d8ce010fda379106b73df7bcce41d2d54c6bdb54e3b5548920e81cd28feeb2bb16be07585cd34cfad3fd2 SHA512 64eff42945a3c4588f81a8d2c9cc70c8a13f678b58e9f5d9058c9d75e0690aa6125ebf891f4362645b51d986b988e9329240320552fb79e24cc659d98362eded
+EBUILD mecab-0.996-r1.ebuild 1395 BLAKE2B 0b6d1435ef1e2f16c7136fea7bbee9b85268031b313fb5e09847920f98e9f2f39107d99900ed1445dd3d31b904d85c6915af95749350c8d9f33bc3baa7c8efe1 SHA512 4e5df2f2ee8aa8b62a71984bcc90660b56ab54eb1d038dc15f221fef65e134a8749406b0cb5ef429783e96fe513d30261d24d4a95b2ae275112817bad63cfbba
+EBUILD mecab-0.996-r2.ebuild 1460 BLAKE2B b6c278a079999789df9e7f6432e4c3a61093983840ded74d7169121789c9890c739ae4ba0cc94ac6295989aad26be6a1270cc1aacf1dc741e901a2b958d8ee27 SHA512 eee58ac944c9b33771ab29c16cb38631f9abf88b5e8dad6c74ef842c3c744106a8f11aa0a79cb60856772d3568ee1c37153699daada99f977ab39f14c2e3f45a
 MISC metadata.xml 413 BLAKE2B e30f9d8b15a3ab4419d79cdafa6615e9d7d353b62732b4e5bb819396f22ad951d485317b1da5d36f7e471fed9037d6efc9753e7e0f26e0c6b73b4501f50e1fc9 SHA512 99d12f9ea78a09e7b4230b8520a18d3d8c8d8d99cf77703c8a0bdcf7df63f3de64e8cdf30df7d046f5e5f98d2113abcca9c25de7671edda51da1a4e6fbc530bd
diff --git a/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch b/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch
new file mode 100644
index 000000000000..a5cc60335209
--- /dev/null
+++ b/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch
@@ -0,0 +1,33 @@
+From 8ddfa1e8c274759f287c9ee73d4d1625028c3bb8 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Thu, 29 Feb 2024 16:44:27 -0500
+Subject: [PATCH] configure: remove terrible horrible code that resets CFLAGS
+ to "-O3"
+
+... and totally ignores all user defined flags.
+---
+ configure.in | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index a5e2a5e..4ac75c1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -85,14 +85,6 @@ else
+         fi
+ fi
+ 
+-dnl
+-dnl check gcc
+-dnl
+-if test -n "$GCC"; then
+-   CFLAGS="-O3 -Wall "
+-   CXXFLAGS="-O3 -Wall "
+-fi
+-
+ dnl
+ dnl check Char Code
+ dnl
+-- 
+2.43.0
+
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index 9eb02cee3b92..13064cdcfed4 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.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="Yet Another Part-of-Speech and Morphological Analyzer"
 HOMEPAGE="https://taku910.github.io/mecab/"
@@ -30,16 +30,13 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.98-iconv.patch
 	"${FILESDIR}"/${PN}-0.996-clang-16-register.patch
+	"${FILESDIR}"/0001-configure-remove-terrible-horrible-code-that-resets-.patch
 )
 
 HTML_DOCS=( doc/. )
 
 src_prepare() {
 	default
-	sed -i \
-		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
-		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in
 	sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in
 
 	mv configure.{in,ac} || die
@@ -47,6 +44,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/924569
+	# https://github.com/taku910/mecab/issues/75
+	filter-lto
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with unicode charset UTF-8)
diff --git a/app-text/mecab/mecab-0.996-r2.ebuild b/app-text/mecab/mecab-0.996-r2.ebuild
index 078cd4f66a9d..7ab1b014a7dd 100644
--- a/app-text/mecab/mecab-0.996-r2.ebuild
+++ b/app-text/mecab/mecab-0.996-r2.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="Yet Another Part-of-Speech and Morphological Analyzer"
 HOMEPAGE="https://taku910.github.io/mecab/"
@@ -31,16 +31,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.98-iconv.patch
 	"${FILESDIR}"/${PN}-0.996-clang-16-register.patch
 	"${FILESDIR}"/${PN}-0.996-clang-16-binary_function.patch
+	"${FILESDIR}"/0001-configure-remove-terrible-horrible-code-that-resets-.patch
 )
 
 HTML_DOCS=( doc/. )
 
 src_prepare() {
 	default
-	sed -i \
-		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
-		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in
 	sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in
 
 	mv configure.{in,ac} || die
@@ -48,6 +45,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/924569
+	# https://github.com/taku910/mecab/issues/75
+	filter-lto
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with unicode charset UTF-8)