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

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     3e06dd4dbcd2bb33f3d75f20c64ea64f105b3afe
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 13:31:04 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 13:31:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e06dd4d

media-gfx/xsane-0.999-r2: fixed gimptool handling

Closes: https://bugs.gentoo.org/666639
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/xsane/xsane-0.999-r2.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r2.ebuild
index 65a365cff25..c45649a3a83 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -76,10 +76,9 @@ src_install() {
 	# link xsane so it is seen as a plugin in gimp
 	if use gimp; then
 		local plugindir
-		if [ -x "${EPREFIX}"/usr/bin/gimptool ]; then
-			plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
-			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		local gimptool=$(ls "${EPREFIX}"/usr/bin/gimptool* | head -n1)
+		if [ -n "${gimptool}" ]; then
+			plugindir="$(${gimptool} --gimpplugindir)/plug-ins"
 		else
 			die "Can't find GIMP plugin directory."
 		fi