From 0ad537e99690027d0f2c80609e968ff42b0e0778 Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Fri, 24 Jan 2020 15:02:59 +0100
Subject: media-gfx/geeqie: fix build with -fno-common/gcc10, thanks slyfox

Also sync stable and live ebuilds

Closes: https://bugs.gentoo.org/706132
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
---
 media-gfx/geeqie/geeqie-1.5.1.ebuild | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'media-gfx/geeqie/geeqie-1.5.1.ebuild')

diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild
index 88c65fbe11e3..85d8651bf878 100644
--- a/media-gfx/geeqie/geeqie-1.5.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,9 +30,9 @@ RDEPEND="
 	tiff? ( media-libs/tiff:0 )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
 	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils"
+DEPEND="${RDEPEND}"
 BDEPEND="
+	dev-util/glib-utils
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
@@ -40,6 +40,8 @@ BDEPEND="
 REQUIRED_USE="gpu-accel? ( gtk3 )
 	map? ( gpu-accel )"
 
+PATCHES=( "${FILESDIR}"/${P}-no_common.patch )
+
 src_prepare() {
 	default
 
@@ -50,7 +52,8 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="--disable-dependency-tracking
+	local myeconfargs=(
+		--disable-dependency-tracking
 		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable debug debug-log)
 		$(use_enable ffmpegthumbnailer)
@@ -63,19 +66,20 @@ src_configure() {
 		$(use_enable map)
 		$(use_enable nls)
 		$(use_enable pdf)
-		$(use_enable tiff)"
+		$(use_enable tiff)
+	)
 
 	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
+		myeconfargs+=( --enable-exiv2 )
 	else
-		myconf="${myconf} --disable-exiv2"
+		myeconfargs+=( --disable-exiv2)
 	fi
 
-	econf ${myconf}
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	rm -f "${D}/usr/share/doc/${PF}/COPYING"
 	# Application needs access to the uncompressed file
-- 
cgit v1.2.3-18-g5258