diff -u -b -B -r1.4 libgphoto2-2.2.1-r1.ebuild --- media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild 20 Jul 2006 14:00:37 -0000 1.4 +++ media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild 24 Aug 2006 21:08:52 -0000 @@ -11,7 +11,24 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="nls doc exif usb hal" + +# By default, drivers for all supported cards will be compiled. +# If you want to only compile for specific card(s), set CAMERAS +# environment to a comma-separated list (no spaces) of drivers that +# you want to build. +IUSE_CAMERAS="cameras_adc65 cameras_agfa-c120 cameras_aox cameras_aox \ + cameras_barbie cameras_canoncameras_casio cameras_clicksmart310 \ + cameras_digigr8 cameras_digita cameras_dimera cameras_directory \ + cameras_enigmal3 cameras_fuji cameras_gsmart300 cameras_hp215 cameras_iclick \ + cameras_jamcam cameras_jdll cameras_kodak cameras_konica cameras_largan \ + cameras_lg_gsm cameras_mars cameras_minolta cameras_mustek cameras_panasonic \ + cameras_pccam300 cameras_pccam600 cameras_polaroid cameras_ptp2 cameras_ricoh \ + cameras_samsung cameras_sierra cameras_sipix cameras_small cameras_sonix \ + cameras_sonydscfl cameras_sonydscf55 cameras_soundvision cameras_spca50x \ + cameras_sq905 cameras_stv0674 cameras_stv0680 cameras_sx330x cameras_template \ + cameras_toshiba" + +IUSE="nls doc exif usb hal ${IUSE_CAMERAS}" RESTRICT="test confcache" # needs >usbutils-0.11-r2 to avoid /usr/lib/libusb* @@ -29,25 +46,7 @@ =app-text/docbook-sgml-dtd-4.2* )" -# By default, drivers for all supported cards will be compiled. -# If you want to only compile for specific card(s), set CAMERAS -# environment to a comma-separated list (no spaces) of drivers that -# you want to build. -IUSE_CAMERAS="adc65 agfa-cl20 aox barbie canon casio clicksmart310 - digigr8 digita dimera directory enigma13 fuji gsmart300 hp215 iclick jamcam - jd11 kodak konica largan lg_gsm mars minolta mustek panasonic pccam300 - pccam600 polaroid ptp2 ricoh samsung sierra sipix smal sonix sonydscf1 - sonydscf55 soundvision spca50x sq905 stv0674 stv0680 sx330z template - toshiba" - pkg_setup() { - if [[ -z "${CAMERAS}" ]] ; then - ewarn "All camera drivers will be built since you did not specify" - ewarn "via the CAMERAS variable what camera you use." - einfo "libgphoto2 supports: all ${IUSE_CAMERAS}" - fi - echo - enewgroup plugdev || die "Error creating plugdev group" } @@ -74,9 +73,11 @@ src_compile() { local cameras local cam - for cam in ${CAMERAS} ; do - has ${cam} ${IUSE_CAMERAS} && cameras="${cameras},${cam}" + + for cam in ${IUSE_CAMERAS} ; do + use ${cam} && cameras="${cameras},${cam#cameras_}" done + [[ -z "${cameras}" ]] \ && cameras="all" \ || cameras="${cameras:1}" --- profiles/desc/cameras.desc.orig 2006-08-24 23:14:45.000000000 +0200 +++ profiles/desc/cameras.desc 2006-08-24 23:13:22.000000000 +0200 @@ -0,0 +1,54 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/desc/elibc.desc,v 1.2 2006/07/12 19:06:34 the_paya Exp $ + +# This file contains descriptions of CAMERAS USE_EXPAND flags. + +# Keep it sorted. + +adc65 - libgphoto support for adc65 cameras +agfa-c120 - libgphoto support for agfa-c120 cameras +aox - libgphoto support for aox cameras +aox - libgphoto support for aox cameras +barbie - libgphoto support for barbie cameras +canoncameras_casio - libgphoto support for canoncameras_casio cameras +clicksmart310 - libgphoto support for clicksmart310 cameras +digigr8 - libgphoto support for digigr8 cameras +digita - libgphoto support for digita cameras +dimera - libgphoto support for dimera cameras +directory - libgphoto support for directory cameras +enigmal3 - libgphoto support for enigmal3 cameras +fuji - libgphoto support for fuji cameras +gsmart300 - libgphoto support for gsmart300 cameras +hp215 - libgphoto support for hp215 cameras +iclick - libgphoto support for iclick cameras +jamcam - libgphoto support for jamcam cameras +jdll - libgphoto support for jdll cameras +kodak - libgphoto support for kodak cameras +konica - libgphoto support for konica cameras +largan - libgphoto support for largan cameras +lg_gsm - libgphoto support for lg_gsm cameras +mars - libgphoto support for mars cameras +minolta - libgphoto support for minolta cameras +mustek - libgphoto support for mustek cameras +panasonic - libgphoto support for panasonic cameras +pccam300 - libgphoto support for pccam300 cameras +pccam600 - libgphoto support for pccam600 cameras +polaroid - libgphoto support for polaroid cameras +ptp2 - libgphoto support for ptp2 cameras +ricoh - libgphoto support for ricoh cameras +samsung - libgphoto support for samsung cameras +sierra - libgphoto support for sierra cameras +sipix - libgphoto support for sipix cameras +small - libgphoto support for small cameras +sonix - libgphoto support for sonix cameras +sonydscfl - libgphoto support for sonydscfl cameras +sonydscf55 - libgphoto support for sonydscf55 cameras +soundvision - libgphoto support for soundvision cameras +spca50x - libgphoto support for spca50x cameras +sq905 - libgphoto support for sq905 cameras +stv0674 - libgphoto support for stv0674 cameras +stv0680 - libgphoto support for stv0680 cameras +sx330x - libgphoto support for sx330x cameras +template - libgphoto support for template cameras +toshiba - libgphoto support for toshiba cameras --- profiles/base/make.defaults 3 Aug 2006 09:20:18 -0000 1.24 +++ profiles/base/make.defaults 24 Aug 2006 21:16:30 -0000 @@ -10,7 +10,7 @@ # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@gentoo.org. -USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC" +USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBCCAMERAS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev.