Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/
Date: Thu, 07 Feb 2019 13:31:42
Message-Id: 1549546287.3e06dd4dbcd2bb33f3d75f20c64ea64f105b3afe.fordfrog@gentoo
1 commit: 3e06dd4dbcd2bb33f3d75f20c64ea64f105b3afe
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 7 13:31:04 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 7 13:31:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e06dd4d
7
8 media-gfx/xsane-0.999-r2: fixed gimptool handling
9
10 Closes: https://bugs.gentoo.org/666639
11 Package-Manager: Portage-2.3.59, Repoman-2.3.12
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 media-gfx/xsane/xsane-0.999-r2.ebuild | 9 ++++-----
15 1 file changed, 4 insertions(+), 5 deletions(-)
16
17 diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r2.ebuild
18 index 65a365cff25..c45649a3a83 100644
19 --- a/media-gfx/xsane/xsane-0.999-r2.ebuild
20 +++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 +# Copyright 1999-2019 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -76,10 +76,9 @@ src_install() {
28 # link xsane so it is seen as a plugin in gimp
29 if use gimp; then
30 local plugindir
31 - if [ -x "${EPREFIX}"/usr/bin/gimptool ]; then
32 - plugindir="$(gimptool --gimpplugindir)/plug-ins"
33 - elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
34 - plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
35 + local gimptool=$(ls "${EPREFIX}"/usr/bin/gimptool* | head -n1)
36 + if [ -n "${gimptool}" ]; then
37 + plugindir="$(${gimptool} --gimpplugindir)/plug-ins"
38 else
39 die "Can't find GIMP plugin directory."
40 fi