summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2009-07-08 18:47:16 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2009-07-08 18:47:16 +0000
commitaca1663a5e3c4b6371e401c1da5c8c979a8812f8 (patch)
treecafa83cc81abe062e341a7f8296373f19636a0ff /media-gfx/sane-backends
parentVersion bump, raise bash dependency to >=3.2 (diff)
downloadgentoo-2-aca1663a5e3c4b6371e401c1da5c8c979a8812f8.tar.gz
gentoo-2-aca1663a5e3c4b6371e401c1da5c8c979a8812f8.tar.bz2
gentoo-2-aca1663a5e3c4b6371e401c1da5c8c979a8812f8.zip
Fixing configure options for libusb-1, see bug #275485.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'media-gfx/sane-backends')
-rw-r--r--media-gfx/sane-backends/ChangeLog6
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.20.ebuild9
2 files changed, 10 insertions, 5 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index fe29b2a72163..cf68b58f2d92 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/sane-backends
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.161 2009/06/24 22:09:55 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.162 2009/07/08 18:47:16 phosphan Exp $
+
+ 08 Jul 2009; Patrick Kursawe <phosphan@gentoo.org>
+ sane-backends-1.0.20.ebuild:
+ Fixing configure options for libusb-1, see bug #275485.
*sane-backends-1.0.20 (24 Jun 2009)
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20.ebuild
index 64134b0d1a99..ad8470cce094 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.20.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20.ebuild,v 1.2 2009/06/25 08:19:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20.ebuild,v 1.3 2009/07/08 18:47:16 phosphan Exp $
EAPI="1"
@@ -200,8 +200,10 @@ src_compile() {
BACKENDS=" "
elog "You are using sane_backends_nothing - disabling all backends!"
fi
- if [ use usb -a has_version "=dev-libs/libusb-1*" ]; then
- myconf="--enable-libusb_1_0"
+ if use usb && has_version "=dev-libs/libusb-1*"; then
+ myconf="--enable-libusb_1_0 --disable-libusb"
+ else
+ myconf=$(use_enable usb libusb)
fi
if ! use doc; then
myconf="${myconf} --disable-latex"
@@ -211,7 +213,6 @@ src_compile() {
fi
SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
BACKENDS="${BACKENDS}" econf \
- $(use_enable usb libusb) \
$(use_with gphoto2) \
$(use_enable ipv6) \
$(use_enable avahi) \