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
commit7b1c189232bd10cb896a46ae99216e79af6d382d (patch)
tree944383ef54000e7d7fd1d9674dc839c26e7f9143 /media-gfx
parentVersion bump, raise bash dependency to >=3.2 (diff)
downloadhistorical-7b1c189232bd10cb896a46ae99216e79af6d382d.tar.gz
historical-7b1c189232bd10cb896a46ae99216e79af6d382d.tar.bz2
historical-7b1c189232bd10cb896a46ae99216e79af6d382d.zip
Fixing configure options for libusb-1, see bug #275485.
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/sane-backends/ChangeLog6
-rw-r--r--media-gfx/sane-backends/Manifest4
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.20.ebuild9
3 files changed, 12 insertions, 7 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/Manifest b/media-gfx/sane-backends/Manifest
index 62931e187951..b7ad748be036 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -15,6 +15,6 @@ EBUILD sane-backends-1.0.17.ebuild 3769 RMD160 aaeaa544e2ff07ee3c56c6fc48c0c85b2
EBUILD sane-backends-1.0.18-r6.ebuild 4278 RMD160 6813867226c83bacea836184ac70cf1b77fffe17 SHA1 a573b3639310b109360cdc29a24261e2059cbd9e SHA256 b9a5718ea3c36f15de7025b50a0812ae851d7ccf8cc5737f69e55a4a94f18157
EBUILD sane-backends-1.0.19-r1.ebuild 4376 RMD160 64c5af36b02721e20948f1c6bf69879f7221f8a4 SHA1 f65a57801bea0710c7122de004afa6d52105ae8f SHA256 2d857ae083482603c58557235535638f4f9a9c337d07ae713878da835141b832
EBUILD sane-backends-1.0.19-r2.ebuild 4482 RMD160 e9139e5efc0c9eadf07b4ed4d88e40e62401246d SHA1 2c15f4318c477c9d959acaf26f026cbb04683991 SHA256 babc258bbfb6cf0edbea22e5b85fd9b2d9f6f0113eddc8471ad545d926b2c7ac
-EBUILD sane-backends-1.0.20.ebuild 5817 RMD160 3dc9b1cee94ef88505ca994976a63d5108f70033 SHA1 c2e1b47d5996224c83633ecd1135b6d995062e12 SHA256 d6ef36250977bb9940bfca6a27e4bc5ecfc65aa46250955b19b5939a915668db
-MISC ChangeLog 27148 RMD160 d512778e45d9d3ff1b96cb73cfcaad90192e2829 SHA1 bcb78852934c130828a7fd4df5ddba1a121d931b SHA256 312e33d02a71c310e047e00fd361521469e7f06229b63acbf48d75d254db8c76
+EBUILD sane-backends-1.0.20.ebuild 5840 RMD160 44dab6329833fdce0e83ddfd4c45d8e041c10000 SHA1 12533963b1d1341059682897a84ceee7a1e7a939 SHA256 3ad8e220b309e0dd72b4d5988e8d5cf1afc92faaed3c727b7ee2c82dbb06613f
+MISC ChangeLog 27291 RMD160 3f5e1c2066199f9ad5edf7f61fba80557b6375f1 SHA1 14af6f98bbb4084023c53671011cf30962d2f397 SHA256 6afe8270b102287612b23a672f6fda8c2eb0eb1d0865da8e4599683f994ce0fc
MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
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) \