fix typos in CAMERAS

Package-Manager: portage-2.1.3.9

5 files changed, 19 insertions, 187 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 2fe9489c2329..811be7fdc7fc 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # 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.110 2007/09/26 18:41:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.111 2007/09/27 11:19:19 eva Exp $
+
+  27 Sep 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgphoto2-2.4.0.ebuild, libgphoto2-2.4.0-r1.ebuild:
+  fix typos in IUSE_CAMERAS per bug #193850
 
   26 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
   libgphoto2-2.4.0-r1.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 39bd125bff8c..12e3ad663d88 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -72,18 +72,14 @@ EBUILD libgphoto2-2.3.1-r5.ebuild 5314 RMD160 1904f96dacfb257e2ba8c1e48381c45d13
 MD5 ee4c7af7f0ef38863bf594967da5c10f libgphoto2-2.3.1-r5.ebuild 5314
 RMD160 1904f96dacfb257e2ba8c1e48381c45d1345ad58 libgphoto2-2.3.1-r5.ebuild 5314
 SHA256 529626d427a24e3d0e62471c9545ddc00a1e6308dbc212424491972a96fa324f libgphoto2-2.3.1-r5.ebuild 5314
-EBUILD libgphoto2-2.4.0-r1.ebuild 5865 RMD160 3ebe33bcc3ed647f220311f4eae886f1a1607ca9 SHA1 b3183c62a8d0fa449e46870565cfd14d6e1c10f4 SHA256 c5edd055deb6b770af6d5103a5ad5732168eab9ccc718a92792cb213812737f5
-MD5 9e47112ab616eb09f1d1514dd19c0bc4 libgphoto2-2.4.0-r1.ebuild 5865
-RMD160 3ebe33bcc3ed647f220311f4eae886f1a1607ca9 libgphoto2-2.4.0-r1.ebuild 5865
-SHA256 c5edd055deb6b770af6d5103a5ad5732168eab9ccc718a92792cb213812737f5 libgphoto2-2.4.0-r1.ebuild 5865
-EBUILD libgphoto2-2.4.0.ebuild 5540 RMD160 80330c2a9fa718e0261ad558d31d784038b0e269 SHA1 35bb55560b6467195b4de396208028ad20305a98 SHA256 f02806934e99d6756a907dc65a6155b33f05231422121811f91b3fdbb41c2f66
-MD5 31cad3168ae7c255f82c2dae2d57367c libgphoto2-2.4.0.ebuild 5540
-RMD160 80330c2a9fa718e0261ad558d31d784038b0e269 libgphoto2-2.4.0.ebuild 5540
-SHA256 f02806934e99d6756a907dc65a6155b33f05231422121811f91b3fdbb41c2f66 libgphoto2-2.4.0.ebuild 5540
-MISC ChangeLog 18429 RMD160 c1e458ec1dc1398f22a88cca3dd5ba73b9c24ecb SHA1 686a44a7360cce9d77d5f085aa05d7e5b132bd12 SHA256 7c29a66bc6cea3f71f0fee4ffe0364ddb3d0ba56e44414a0e02bc613aabd62a6
-MD5 c1b6b8cf38679b6ebdf32068b5c2ba78 ChangeLog 18429
-RMD160 c1e458ec1dc1398f22a88cca3dd5ba73b9c24ecb ChangeLog 18429
-SHA256 7c29a66bc6cea3f71f0fee4ffe0364ddb3d0ba56e44414a0e02bc613aabd62a6 ChangeLog 18429
+EBUILD libgphoto2-2.4.0-r1.ebuild 5858 RMD160 960a6874fe4161155208a49b4646da2e40f22bef SHA1 f97a3127e15f6c41b7a86342772588a3f074e838 SHA256 389c8a9efb03802e2ff0a5e55360d6005194942071f1c16ce34ed638127f4782
+MD5 4a9d15f7e3fb8bdb1343b897bd3cabcb libgphoto2-2.4.0-r1.ebuild 5858
+RMD160 960a6874fe4161155208a49b4646da2e40f22bef libgphoto2-2.4.0-r1.ebuild 5858
+SHA256 389c8a9efb03802e2ff0a5e55360d6005194942071f1c16ce34ed638127f4782 libgphoto2-2.4.0-r1.ebuild 5858
+MISC ChangeLog 18583 RMD160 28199310e4872ccee4a83ae77ab038fa51247936 SHA1 697f925ff8d620a69f27ec5e277a32efe194ce69 SHA256 a7ba0f3168b1255c046344dc675270a15f5755720ef3af5a705120bd97b0b075
+MD5 47ba285a45cd1c81471f8b0c3e43d89b ChangeLog 18583
+RMD160 28199310e4872ccee4a83ae77ab038fa51247936 ChangeLog 18583
+SHA256 a7ba0f3168b1255c046344dc675270a15f5755720ef3af5a705120bd97b0b075 ChangeLog 18583
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
 MD5 7f9a9f03e32d907819c6891242037f7c metadata.xml 182
 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 metadata.xml 182
@@ -103,16 +99,13 @@ SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/di
 MD5 f59a564d9acf40c03e04fbadc8f52b1d files/digest-libgphoto2-2.3.1-r5 256
 RMD160 02bfc9e1c415b30e127ea38588f08e83c22beb73 files/digest-libgphoto2-2.3.1-r5 256
 SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/digest-libgphoto2-2.3.1-r5 256
-MD5 fe1406182385e3183e892136f820991a files/digest-libgphoto2-2.4.0 256
-RMD160 7d12c514df1bf2257fbc731880580bddc5b0ec6c files/digest-libgphoto2-2.4.0 256
-SHA256 f1c96a5b69af736e43e71fd4a9c4eb20cca97bb5b699a8276b1d70c7139af2f4 files/digest-libgphoto2-2.4.0 256
 MD5 fe1406182385e3183e892136f820991a files/digest-libgphoto2-2.4.0-r1 256
 RMD160 7d12c514df1bf2257fbc731880580bddc5b0ec6c files/digest-libgphoto2-2.4.0-r1 256
 SHA256 f1c96a5b69af736e43e71fd4a9c4eb20cca97bb5b699a8276b1d70c7139af2f4 files/digest-libgphoto2-2.4.0-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG+qf5t2vP6XvVdOcRAguqAJ43ebh43mkxMXzapeSLPPnLYL5HBgCfUcmc
-a3vsXJKxW7qDEtCh/+X8lZk=
-=+vac
+iD8DBQFG+5IB1fmVwcYIWAYRAup8AKDRX+gg7sbvajINk5KdnnF4FtqfjACgmKdX
+lWrZQH4+bnJR9zmuCbTb448=
+=HCVN
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0 b/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0
deleted file mode 100644
index d6f9ffd6b2d9..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a60154772635b693ff08b4f34dea7f61 libgphoto2-2.4.0.tar.bz2 3180009
-RMD160 4cba4247bd7e4f9334f2f6bda649b343007da775 libgphoto2-2.4.0.tar.bz2 3180009
-SHA256 0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79 libgphoto2-2.4.0.tar.bz2 3180009
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
index 1ed2c486f024..dd11f7e11f50 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.0-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.4.0-r1.ebuild,v 1.3 2007/09/26 18:41:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild,v 1.4 2007/09/27 11:19:19 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -28,10 +28,10 @@ RESTRICT="test"
 # If you want to only compile for specific camera(s), set CAMERAS
 # environment to a space-separated list (no commas) of drivers that
 # you want to build.
-IUSE_CAMERAS="adc65 agfa_cl20 aox barbie canon casio casio_qv clicksmart310
+IUSE_CAMERAS="adc65 agfa_cl20 aox barbie canon casio_qv clicksmart310
 digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick
 jamcam jd11 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200
-konica konika_qm150 largan lg_gsm mars dimagev mustek panasonic_coolshot
+konica konica_qm150 largan lg_gsm mars dimagev mustek panasonic_coolshot
 panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600
 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung
 sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.0.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.0.ebuild
deleted file mode 100644
index 2b75c364ce97..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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.4.0.ebuild,v 1.2 2007/09/25 06:39:10 eva Exp $
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
-# 2. Track upstream bug udevscriptdir does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1646520&group_id=8874&atid=108874
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1648346&group_id=8874&atid=108874
-# 3. Track upstream bug regarding rpm usage.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874
-
-inherit eutils autotools
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="nls doc exif hal kernel_linux"
-RESTRICT="test"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="adc65 agfa_cl20 aox barbie canon casio casio_qv clicksmart310
-digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick
-jamcam jd11 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200
-konica konika_qm150 largan lg_gsm mars dimagev mustek panasonic_coolshot
-panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600
-polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung
-sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55
-soundvision spca50x sq905 stv0674 stv0680 sx330z template toshiba_pdrm11"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-RDEPEND=">=dev-libs/libusb-0.1.8
-	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? ( >=sys-apps/hal-0.5 )
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114"
-
-pkg_setup() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "libgphoto2 supports: all ${IUSE_CAMERAS}"
-		einfo "All camera drivers will be built since you did not specify"
-		einfo "via the CAMERAS variable what camera you use."
-		ewarn "NOTICE: Upstream will not support you if you do not compile all camera drivers first"
-	fi
-
-	if use cameras_template || use cameras_sipix_blink; then
-		einfo "Upstream considers sipix_blink & template driver as obsolete"
-	fi
-
-	enewgroup plugdev || die "Error creating plugdev group"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-rpm.patch
-
-	# Fix as-needed at configure time
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	AT_M4DIR="${S}/auto-m4 ${S}/m4m" eautoreconf
-}
-
-src_compile() {
-	local cameras
-	local cam
-	for cam in ${IUSE_CAMERAS} ; do
-		use "cameras_${cam}" && cameras="${cameras},${cam}"
-	done
-
-	[ -z "${cameras}" ] \
-		&& cameras="all" \
-		|| cameras="${cameras:1}"
-
-	einfo "Enabled camera drivers: ${cameras}"
-	[ "${cameras}" != "all" ] && \
-		ewarn "Upstream will not support you if you do not compile all camera drivers first"
-
-	local myconf
-
-	use exif \
-		&& myconf="${myconf} --with-exif-prefix=/usr" \
-		|| myconf="${myconf} --without-exif"
-
-	econf \
-		--with-drivers=${cameras} \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		--with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
-		$(use_enable nls) \
-		--with-rpmbuild=/bin/true \
-		--disable-docs \
-		udevscriptdir=/lib/udev \
-		GTKDOC=/bin/true \
-		${myconf} || die "econf failed"
-#		$(use_enable doc docs) \	TODO
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# fixup autoconf bug TODO
-	if ! use doc && [ -d "${D}/usr/share/doc/${PF}/apidocs.html" ]; then
-		rm -fr "${D}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING
-
-	HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi"
-	UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules"
-
-	if [ -x "${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		if use hal; then
-			einfo "Generating HAL FDI files ..."
-			mkdir -p "${D}"/${HAL_FDI%/*}
-			"${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> "${D}"/${HAL_FDI} \
-				|| die "failed to create hal-fdi"
-		fi
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p "${D}"/${UDEV_RULES%/*}
-		"${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list \
-			udev-rules version 0.98	group plugdev mode 0660 >> "${D}"/${UDEV_RULES} \
-			|| die "failed to create udev-rules"
-	else
-		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap or HAL FDI files."
-		eerror "You will have to manually generate it by running:"
-		eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules version 0.98 group plugdev mode 0660 > ${UDEV_RULES}"
-		eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi > ${HAL_FDI}"
-	fi
-
-}
-
-pkg_postinst() {
-	elog "Don't forget to add yourself to the plugdev group "
-	elog "if you want to be able to access your camera."
-}