summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2005-05-31 05:57:46 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2005-05-31 05:57:46 +0000
commitdfc2dccb2dc4b03caf62d6dabeb5a3c7b8213f15 (patch)
tree2fc015716eeee068965dacc015f8a2050522010a /media-gfx/sane-frontends
parentAdded sparc stable keyword (diff)
downloadgentoo-2-dfc2dccb2dc4b03caf62d6dabeb5a3c7b8213f15.tar.gz
gentoo-2-dfc2dccb2dc4b03caf62d6dabeb5a3c7b8213f15.tar.bz2
gentoo-2-dfc2dccb2dc4b03caf62d6dabeb5a3c7b8213f15.zip
Fixing yesterday's fix.
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-gfx/sane-frontends')
-rw-r--r--media-gfx/sane-frontends/ChangeLog6
-rw-r--r--media-gfx/sane-frontends/Manifest2
-rw-r--r--media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild25
3 files changed, 23 insertions, 10 deletions
diff --git a/media-gfx/sane-frontends/ChangeLog b/media-gfx/sane-frontends/ChangeLog
index 1153d59e97d3..134171a7c4cc 100644
--- a/media-gfx/sane-frontends/ChangeLog
+++ b/media-gfx/sane-frontends/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/sane-frontends
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/ChangeLog,v 1.27 2005/05/30 13:03:48 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/ChangeLog,v 1.28 2005/05/31 05:57:46 phosphan Exp $
+
+ 31 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+ sane-frontends-1.0.13.ebuild:
+ Fixing yesterday's fix.
30 May 2005; Patrick Kursawe <phosphan@gentoo.org>
-sane-frontends-1.0.11.ebuild, -sane-frontends-1.0.12.ebuild,
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index aeaba493b3ed..0f9e95f241b0 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,4 +1,4 @@
MD5 21bde5516bc7636cc97934c7e043227c ChangeLog 4000
MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
-MD5 16ae2aec99796a819b3d2cc072a4e6a4 sane-frontends-1.0.13.ebuild 1171
+MD5 a1b9b70749f7a3d2fd9a119490414281 sane-frontends-1.0.13.ebuild 1463
MD5 95e4447b4d866c1b4232400337a67cb5 files/digest-sane-frontends-1.0.13 73
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild
index 8c1ad39b3dee..b037ee4c96ea 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild,v 1.8 2005/05/30 13:03:48 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild,v 1.9 2005/05/31 05:57:46 phosphan Exp $
DESCRIPTION="Scanner Access Now Easy"
HOMEPAGE="http://www.sane-project.org"
@@ -26,14 +26,23 @@ src_compile() {
}
src_install() {
+ local gimpplugindir
+ local gimptool
einstall datadir=${D}/usr/share/misc || die
if use gimp; then
- einfo "Setting plugin link for GIMP version $(gimptool --version)"
-
- gimpplugindir=$(/usr/bin/gimptool --gimpplugindir)/plug-ins
-
- dodir ${gimpplugindir}
- dosym /usr/bin/xscanimage ${gimpplugindir}/xscanimage
+ for gimptool in gimptool gimptool-2.0 gimptool-1.2; do
+ if [ -x /usr/bin/${gimptool} ]; then
+ einfo "Setting plugin link for GIMP version $(/usr/bin/${gimptool} --version)"
+ gimpplugindir=$(/usr/bin/${gimptool} --gimpplugindir)/plug-ins
+ break
+ fi
+ done
+ if [ "/plug-ins" != "${gimpplugindir}" ]; then
+ dodir ${gimpplugindir}
+ dosym /usr/bin/xscanimage ${gimpplugindir}/xscanimage
+ else
+ ewarn "No idea where to find the gimp plugin directory"
+ fi
fi
- dodoc AUTHORS Changelog NEWS PROBLEMS README TODO
+ dodoc AUTHORS Changelog NEWS PROBLEMS README
}