From a412b2e60f09bd02e7797bbb68724d1a8449369c Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Wed, 28 Mar 2007 11:48:23 +0000 Subject: [PATCH] Removed use-flag usb, now depending unconditionally on libusb, as else configure dies, thanks to armin76 for noticing. Package-Manager: portage-2.1.2.2 --- media-libs/libgphoto2/ChangeLog | 7 ++++- media-libs/libgphoto2/Manifest | 26 +++++++++++++------ .../libgphoto2/libgphoto2-2.2.1-r1.ebuild | 16 +++++------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 2a0d89954bc4..ea43fe04246d 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.99 2007/03/28 11:44:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.100 2007/03/28 11:48:23 zzam Exp $ + + 28 Mar 2007; Matthias Schwarzott + libgphoto2-2.2.1-r1.ebuild: + Removed use-flag usb, now depending unconditionally on libusb, as else + configure dies, thanks to armin76 for noticing. 28 Mar 2007; Raúl Porcel libgphoto2-2.2.1-r1.ebuild: ia64 stable wrt bug 158626 diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 9381a4d559ca..f5ae724ce939 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX canon.powershot.usermap 4575 RMD160 d280ac90745b440133b33d203dfd121cf31c5b96 SHA1 4a57170205f4a7393a3686f7e29a4567da832aa8 SHA256 93cfa9d2028cab38de7c4f89d46c929313b3bca4120bafb8bbcf5747c3169f3a MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575 RMD160 d280ac90745b440133b33d203dfd121cf31c5b96 files/canon.powershot.usermap 4575 @@ -45,10 +48,10 @@ EBUILD libgphoto2-2.1.6-r1.ebuild 4474 RMD160 4199b0a09d6787d9eebebecadb53d875ba MD5 fe93700a4b829aa5342976591e5c8457 libgphoto2-2.1.6-r1.ebuild 4474 RMD160 4199b0a09d6787d9eebebecadb53d875ba9ed632 libgphoto2-2.1.6-r1.ebuild 4474 SHA256 fe060836abd1eb38a1d7c3c1d9db60ccc1b655266e6ce44d1083613a460a98c5 libgphoto2-2.1.6-r1.ebuild 4474 -EBUILD libgphoto2-2.2.1-r1.ebuild 5512 RMD160 05bb13514464a04acb045e49d4ca68ac9ec5cf28 SHA1 390c38c7efaebc2908a0bf5580e002f4907489e9 SHA256 eea2417807b339263b585ac3f7c40010cdb4cd3d5b92729c95bc5fd3ec74dc06 -MD5 6d57175c92db1159fc69b8088564a48d libgphoto2-2.2.1-r1.ebuild 5512 -RMD160 05bb13514464a04acb045e49d4ca68ac9ec5cf28 libgphoto2-2.2.1-r1.ebuild 5512 -SHA256 eea2417807b339263b585ac3f7c40010cdb4cd3d5b92729c95bc5fd3ec74dc06 libgphoto2-2.2.1-r1.ebuild 5512 +EBUILD libgphoto2-2.2.1-r1.ebuild 5358 RMD160 5f11610e006f7af114944ae3dd8dc386d899e75e SHA1 02969ae763398e733642f3e0aa51547ea6d14b57 SHA256 3cb4e097d9a86e003b83b475f32940bb234b2226971ce04d42c3038b9366eb11 +MD5 7480d2b3a896dac4d1644d93770d01d4 libgphoto2-2.2.1-r1.ebuild 5358 +RMD160 5f11610e006f7af114944ae3dd8dc386d899e75e libgphoto2-2.2.1-r1.ebuild 5358 +SHA256 3cb4e097d9a86e003b83b475f32940bb234b2226971ce04d42c3038b9366eb11 libgphoto2-2.2.1-r1.ebuild 5358 EBUILD libgphoto2-2.3.1-r2.ebuild 5213 RMD160 b2285345c35e9993d0cf7b925d0b38f718062913 SHA1 413db2f42554f1b3e46de59e7175e57bf53ceaac SHA256 1b387449192411543feb3b6f724e44555109ed930b4f7fc7277c4171646d9fa7 MD5 4ecff4782e2db22fbe52bc71b6468470 libgphoto2-2.3.1-r2.ebuild 5213 RMD160 b2285345c35e9993d0cf7b925d0b38f718062913 libgphoto2-2.3.1-r2.ebuild 5213 @@ -61,10 +64,10 @@ EBUILD libgphoto2-2.3.1-r4.ebuild 5274 RMD160 5a1d474a7dd46631f5b6407ca227754b20 MD5 9ae0e1ab1f7a7403ea3c4e07e2a84dea libgphoto2-2.3.1-r4.ebuild 5274 RMD160 5a1d474a7dd46631f5b6407ca227754b2067b58f libgphoto2-2.3.1-r4.ebuild 5274 SHA256 7b10c77cc16fbb3033590d5e14f9baa27a4996ed3af2775b1c6822e687e1e5b5 libgphoto2-2.3.1-r4.ebuild 5274 -MISC ChangeLog 16427 RMD160 27bda79b8598bca1fae71b4956d980e0455a0d0e SHA1 b0213a3d0f79d1d0d0b3827d7a29b9bdaf38c2c7 SHA256 f04954d21b5f1ffe7ab1f67f7dc19b0b54d1006e4927fc7c6ba722e8c64857a8 -MD5 0dbbdc92133b803d9718455e3db7a0da ChangeLog 16427 -RMD160 27bda79b8598bca1fae71b4956d980e0455a0d0e ChangeLog 16427 -SHA256 f04954d21b5f1ffe7ab1f67f7dc19b0b54d1006e4927fc7c6ba722e8c64857a8 ChangeLog 16427 +MISC ChangeLog 16632 RMD160 3b94e2ce9ed86257b0c77132a2a8507598597a01 SHA1 4a4f3fc29081a04417cee193db71f62b0ea84da3 SHA256 478da323daef229e3f338a82770bbf3d19972f4492e486c2695c6f79c5a465a4 +MD5 7eb4471b53bec5bff7cb1aab4c1affce ChangeLog 16632 +RMD160 3b94e2ce9ed86257b0c77132a2a8507598597a01 ChangeLog 16632 +SHA256 478da323daef229e3f338a82770bbf3d19972f4492e486c2695c6f79c5a465a4 ChangeLog 16632 MISC metadata.xml 273 RMD160 ba47ae4270a03bdca07255550d34c988816001bf SHA1 5edf5229a614bb7b9667d0dc64d455f9c282fa56 SHA256 a6bef8cc7f89558f4236d2a7507e97e966e38b31c8dffcd65f7a428f5fe96623 MD5 7e59357e866fde5180e2184134acafdc metadata.xml 273 RMD160 ba47ae4270a03bdca07255550d34c988816001bf metadata.xml 273 @@ -84,3 +87,10 @@ SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/di MD5 f59a564d9acf40c03e04fbadc8f52b1d files/digest-libgphoto2-2.3.1-r4 256 RMD160 02bfc9e1c415b30e127ea38588f08e83c22beb73 files/digest-libgphoto2-2.3.1-r4 256 SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/digest-libgphoto2-2.3.1-r4 256 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGClYSt2vP6XvVdOcRAmS0AKDZ2ORKlp1fYoyNiXfAP21LUrTbwgCgt7GF +7D6/p5OU+DuOiU+WM0lNkYk= +=/Gjw +-----END PGP SIGNATURE----- diff --git a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild index 054784343d06..d679c0978274 100644 --- a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.20 2007/03/28 11:44:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.21 2007/03/28 11:48:23 zzam Exp $ inherit libtool eutils autotools @@ -11,15 +11,11 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" -IUSE="nls doc exif usb hal" +IUSE="nls doc exif hal" RESTRICT="test confcache" -# needs >usbutils-0.11-r2 to avoid /usr/lib/libusb* -# conflicts with dev-libs/libusb -RDEPEND="usb? ( - >=dev-libs/libusb-0.1.8 - >=sys-apps/usbutils-0.11-r2 - ) +RDEPEND=" + >=dev-libs/libusb-0.1.8 exif? ( >=media-libs/libexif-0.5.9 ) hal? ( >=sys-apps/hal-0.5 ) sys-devel/libtool" @@ -114,7 +110,7 @@ src_install() { dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING CHANGES # install hotplug support - if use usb && use kernel_linux; then + if use kernel_linux; then insinto /etc/hotplug/usb newins ${S}/packaging/linux-hotplug/usbcam.group usbcam chmod +x ${D}/etc/hotplug/usb/usbcam @@ -130,7 +126,7 @@ src_install() { HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi" UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules" - if use usb && use kernel_linux; then + if use kernel_linux; then einfo "Generating usbcam-gphoto2.usermap ..." echo "# !!! DO NOT EDIT THIS FILE !!! This file is automatically generated." > ${D}/${HOTPLUG_USERMAP} echo "# Put your custom entries in /etc/hotplug/usb/usbcam.usermap" >> ${D}/${HOTPLUG_USERMAP} -- 2.26.2