From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1070883-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8BA37138334
for <garchives@archives.gentoo.org>; Thu, 7 Feb 2019 13:31:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9C51AE0B43;
Thu, 7 Feb 2019 13:31:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 74A2CE0B43
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Feb 2019 13:31:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2490A335DA2
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Feb 2019 13:31:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ADECF463
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Feb 2019 13:31:38 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org>
Message-ID: <1549546287.3e06dd4dbcd2bb33f3d75f20c64ea64f105b3afe.fordfrog@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/xsane/xsane-0.999-r2.ebuild
X-VCS-Directories: media-gfx/xsane/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: 3e06dd4dbcd2bb33f3d75f20c64ea64f105b3afe
X-VCS-Branch: master
Date: Thu, 7 Feb 2019 13:31:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a0d09825-32d2-47a5-9567-7b7180fb38d0
X-Archives-Hash: 1c8d0b149f140774e3548b4d4b308061
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