[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/

[Eli Schwartz]

commit:     61e06ebae00b29238ee3c2899859a8cc1ac3e124
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 00:01:29 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 03:32:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e06eba

media-gfx/geeqie: remove LTO workaround

Fixed upstream in 2.4

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 media-gfx/geeqie/geeqie-2.4.ebuild  | 7 +------
 media-gfx/geeqie/geeqie-9999.ebuild | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild 
b/media-gfx/geeqie/geeqie-2.4.ebuild
index f533a7ba88cb..6a0d6f40a119 100644
--- a/media-gfx/geeqie/geeqie-2.4.ebuild
+++ b/media-gfx/geeqie/geeqie-2.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 LUA_COMPAT=( lua5-{3,4} )
 
-inherit flag-o-matic lua-single meson optfeature xdg
+inherit lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org";
@@ -64,11 +64,6 @@ 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 739e6f7323f0..254d54766ea2 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 LUA_COMPAT=( lua5-{3,4} )
 
-inherit flag-o-matic git-r3 lua-single meson optfeature xdg
+inherit git-r3 lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org";
@@ -57,11 +57,6 @@ 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"