5 files changed, 22 insertions, 7 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 870dfccd1000..4091f4652c23 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 37e1995401bc..8e694994e105 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -5,7 +5,7 @@ DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05
 DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
 DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a
 DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe
-EBUILD geeqie-2.1-r1.ebuild 3145 BLAKE2B 6f109e412114bf0e714858bfda4e48e4d0ff66bf2f69db55cfd400a9bf63c0f3a62cf33ee291c4b42f4ad0ab8cce53079a03d25fcb6391f54046b8245dded573 SHA512 7c166f155c7a3381baab970e957ce05aac4d73a98f228828e7c9b99df8cee44b390dc30a74c653c37cf5a6e1557c6cc7901a791b4591ebb7a97acf174f4b7845
-EBUILD geeqie-2.2.ebuild 3152 BLAKE2B 6b726510c2612f2ce6a1ee47a0e3c1fb9a676d09b79852756f6d0c81eefc59bde3e23c2b499cac2358e56ec98344c7a8cf9e98e0a49484b11ee0825bc6997753 SHA512 367519c74dafd8a5b8e1d6fc7a3cdd2e7b6adbba729dacbd385fcd3691cc75a6b89ece7f3ae0949e046402b029c9604c8fdb32f1d5d33b479f1993e0ba2766d9
-EBUILD geeqie-9999.ebuild 2946 BLAKE2B d9deaa6cfed97e34e0969e2aa4f64ff7881b342c4c095bae6a8ac1ef5f99f5120fdc4ee64c554a97c3715e402d6c5bc2c5e915531891c0f2b9b8a79f902694b0 SHA512 a5e6b76d4c3b2c024f2f98d87335e679553315b88b9d809fcfc5603157576b5abb6d3848c9feb0bf18107c126eaf9530540489ee1080a7d787ec428c0e944c52
+EBUILD geeqie-2.1-r1.ebuild 3277 BLAKE2B e9a43ed274613dd5a98552d1d83768cffbc0be641d1661d6bd9b5d4b599e210d48dd6fe771c03d90abfc895bd582901e1ac0c4c224edbe96c6139f75e0b40e87 SHA512 f1a090d18fe0f6bb6ab3f7ecb6c42a996fcfbe05457f97ae00cff4d44da057107acd982616ffc307208bc893235ec5b1bcaeee79eefbae177a445a1f465e54da
+EBUILD geeqie-2.2.ebuild 3284 BLAKE2B 3c81435058a54a3da139b128db23b2adc7a378c9fb6a7f81cc9405b427ad66696f94c42bf39fb65583d79a8ac7428c2130a4e780410643fe6511457d4b3bea67 SHA512 db41ac9bfe390f64c6352a33f9c2181d3fe27d0e15c256cabef7ab026d4398342f0de05c4f29466634ec419d07f2c13b6294551e27dcb47df66c221f55aa6641
+EBUILD geeqie-9999.ebuild 3078 BLAKE2B 701b8a0a38d0b7ce8c0385be9c659ec54157f369f5efac68211084f4bc66edc897c0425f5f091b31a2143c5855460044a2209156b0dc0c41d04e051ca2d1ec0c SHA512 9c695dfb1482e2a9879b2d28b04788babd66dd9ab52b84cf17e07d91213b4bc2e329a8c204b83d9ba21db3f76c2248e6c114ba4bf206e8214ca8a6bab9362291
 MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd
diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
index e19752f02bbd..2a7751b70258 100644
--- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 LUA_COMPAT=( lua5-{3,4} )
 
-inherit lua-single meson optfeature xdg
+inherit flag-o-matic lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -64,6 +64,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/585432
+	# https://github.com/BestImageViewer/geeqie/issues/1270
+	filter-lto
+
 	local emesonargs=(
 		-Dgq_helpdir="share/doc/${PF}"
 		-Dgq_htmldir="share/doc/${PF}/html"
diff --git a/media-gfx/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.2.ebuild
index c1bf5433b1fb..db97d02cdbaa 100644
--- a/media-gfx/geeqie/geeqie-2.2.ebuild
+++ b/media-gfx/geeqie/geeqie-2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 LUA_COMPAT=( lua5-{3,4} )
 
-inherit lua-single meson optfeature xdg
+inherit flag-o-matic lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -62,6 +62,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/585432
+	# https://github.com/BestImageViewer/geeqie/issues/1270
+	filter-lto
+
 	local emesonargs=(
 		-Dgq_helpdir="share/doc/${PF}"
 		-Dgq_htmldir="share/doc/${PF}/html"
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index 80135160f44c..97a864ec91b7 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 LUA_COMPAT=( lua5-{3,4} )
 
-inherit git-r3 lua-single meson optfeature xdg
+inherit flag-o-matic git-r3 lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -59,6 +59,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/585432
+	# https://github.com/BestImageViewer/geeqie/issues/1270
+	filter-lto
+
 	local emesonargs=(
 		-Dgq_helpdir="share/doc/${PF}"
 		-Dgq_htmldir="share/doc/${PF}/html"