From: Joe McCann <joem@gentoo.org>
Date: Fri, 21 Oct 2005 04:02:40 +0000 (+0000)
Subject: Only display error if use=jpeg and ! use=exif. It was confusing for users and me... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e52b0b349c92468efa23c002f7b36c247293804;p=gentoo.git

Only display error if use=jpeg and ! use=exif. It was confusing for users and me to see the error message when we had the right combo of use flags
Package-Manager: portage-2.0.53_rc5
---

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 8e0332872e87..0d1a3afe34f7 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.55 2005/10/14 23:54:15 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.56 2005/10/21 04:02:40 joem Exp $
+
+  21 Oct 2005; Joe McCann <joem@gentoo.org> libgphoto2-2.1.6-r1.ebuild:
+  Only display error if use=jpeg and ! use=exif. It was confusing for users
+  and me to see the error message when we had the right combo of use flags
 
 *libgphoto2-2.1.6-r1 (14 Oct 2005)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index ceffac77f53f..f5b1e3f2f798 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,18 +1,18 @@
-MD5 9bdc55dbb224488ada58de4d1d8fd2aa libgphoto2-2.1.4.ebuild 3872
-MD5 09e03121ecd86f34ca1d457b262fcc66 libgphoto2-2.1.6.ebuild 4097
-MD5 cf0e09367f6c3cfcb4f33361d29dedd2 libgphoto2-2.1.6-r1.ebuild 4395
-MD5 84b14458116bed8e0c301719b08005a5 libgphoto2-2.1.5.ebuild 4011
-MD5 0415130d07d423dd407c7a9ec1c124db ChangeLog 8549
-MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 96e1e6b4f84552261a98e93deda8f0f1 ChangeLog 8768
+MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
 MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4 70
 MD5 c1ead5696ef5db4a488f3457529e0a6c files/digest-libgphoto2-2.1.5 69
 MD5 b99fd4203cf4ad0c3b53222749d3b06f files/digest-libgphoto2-2.1.6 69
-MD5 f7704d68a87116356901f49376fa1778 files/libgphoto2-2.1.4-canon.patch 3594
-MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
-MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
-MD5 d9f7cf4aab81ea4981c30a5e313f3f8e files/libgphoto2-2.1.4-blink2.patch 1655
-MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929
-MD5 1a200bb63548924b958987cd87c45dda files/libgphoto2-2.1.3-canon.patch 8487
 MD5 b99fd4203cf4ad0c3b53222749d3b06f files/digest-libgphoto2-2.1.6-r1 69
 MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
+MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929
+MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
+MD5 1a200bb63548924b958987cd87c45dda files/libgphoto2-2.1.3-canon.patch 8487
+MD5 d9f7cf4aab81ea4981c30a5e313f3f8e files/libgphoto2-2.1.4-blink2.patch 1655
+MD5 f7704d68a87116356901f49376fa1778 files/libgphoto2-2.1.4-canon.patch 3594
 MD5 3b33f744c18b1251ef1d6ce48978dd6b files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
+MD5 9bdc55dbb224488ada58de4d1d8fd2aa libgphoto2-2.1.4.ebuild 3872
+MD5 84b14458116bed8e0c301719b08005a5 libgphoto2-2.1.5.ebuild 4011
+MD5 ec1d7b9e5a27e743e75d6aede6f97424 libgphoto2-2.1.6-r1.ebuild 4417
+MD5 09e03121ecd86f34ca1d457b262fcc66 libgphoto2-2.1.6.ebuild 4097
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild
index 28145696d4fc..2679e5a4460d 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.6-r1.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-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild,v 1.1 2005/10/14 23:54:15 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild,v 1.2 2005/10/21 04:02:40 joem Exp $
 
 inherit libtool eutils
 
@@ -40,7 +40,9 @@ pkg_setup() {
 		einfo "libgphoto2 supports: all ${IUSE_CAMERAS}"
 	fi
 	echo
-	use jpeg && ewarn "For 'exif' support, you need to set USE=exif"
+	if use jpeg && ! use exif ; then
+		ewarn "For 'exif' support, you need to set USE=exif"
+	fi
 
 	enewgroup plugdev || die "Error creating plugdev group"
 }