IUSE_ syntax

6 files changed, 46 insertions, 49 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 1f29069d903e..ebe507b9d6fd 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.29 2004/06/24 23:10:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.30 2004/07/13 01:12:32 vapier Exp $
+
+  12 Jul 2004; Mike Frysinger <vapier@gentoo.org> libgphoto2-2.1.1-r2.ebuild,
+  libgphoto2-2.1.2-r1.ebuild, libgphoto2-2.1.3-r1.ebuild,
+  libgphoto2-2.1.3.ebuild, libgphoto2-2.1.4.ebuild:
+  Move GPHOTO_LIBS to use the IUSE_ syntax.
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> libgphoto2-2.1.2-r1.ebuild,
   libgphoto2-2.1.3-r1.ebuild, libgphoto2-2.1.3.ebuild,
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild
index 67889a316403..27d053c2308c 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild,v 1.14 2004/06/24 23:10:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.1-r2.ebuild,v 1.15 2004/07/13 01:12:32 vapier Exp $
 
 inherit libtool eutils flag-o-matic
-MAKEOPTS="-j1" # or the documentation fails. bah!
 
 DESCRIPTION="free, redistributable digital camera software application"
 HOMEPAGE="http://www.gphoto.org/"
@@ -43,7 +42,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-docs"
 
 	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
+	# or the documentation fails. bah!
+	emake -j1 || die "make failed"
 }
 
 src_install() {
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
index 0e5c5bbf790c..3344e1c9e166 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild,v 1.13 2004/06/24 23:10:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild,v 1.14 2004/07/13 01:12:32 vapier Exp $
 
 inherit libtool eutils
 
-MAKEOPTS="-j1" # or the documentation fails. bah!
-
 DESCRIPTION="free, redistributable digital camera software application"
 HOMEPAGE="http://www.gphoto.org/"
 SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
@@ -20,7 +18,6 @@ RDEPEND=">=dev-libs/libusb-0.1.6
 	>=sys-apps/usbutils-0.11-r2
 	sys-apps/hotplug
 	jpeg? ( >=media-libs/libexif-0.5.9 )"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/patch-2.5.9
 	dev-util/pkgconfig
@@ -47,7 +44,8 @@ src_compile() {
 	myconf="${myconf} `use_enable doc docs`"
 
 	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
+	# or the documentation fails. bah!
+	emake -j1 || die "make failed"
 }
 
 src_install() {
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild
index f7fd4e64f695..f10fbdbffc9f 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild,v 1.9 2004/06/24 23:10:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild,v 1.10 2004/07/13 01:12:32 vapier Exp $
 
 inherit libtool eutils
 
-MAKEOPTS="${MAKEOPTS} -j1" # or the documentation fails.
-
-DESCRIPTION="Library that implements support for numerous digital cameras."
+DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
 SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
@@ -21,7 +19,6 @@ RDEPEND=">=dev-libs/libusb-0.1.6
 	>=sys-apps/usbutils-0.11-r2
 	sys-apps/hotplug
 	jpeg? ( >=media-libs/libexif-0.5.9 )"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/patch-2.5.9
 	dev-util/pkgconfig
@@ -46,7 +43,6 @@ DEPEND="${RDEPEND}
 #
 [ -z "${GPHOTO_LIBS}" ] && GPHOTO_LIBS="all"
 
-
 src_unpack() {
 	unpack ${A}
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
@@ -71,7 +67,8 @@ src_compile() {
 	myconf="${myconf} `use_enable doc docs`"
 
 	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
+	# or the documentation fails.
+	emake -j1 || die "make failed"
 }
 
 src_install() {
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
index 00a234737da5..0d282f3a456b 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild,v 1.7 2004/06/24 23:10:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild,v 1.8 2004/07/13 01:12:32 vapier Exp $
 
 inherit libtool eutils
 
-MAKEOPTS="${MAKEOPTS} -j1" # or the documentation fails.
-
-DESCRIPTION="Library that implements support for numerous digital cameras."
+DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
 SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
@@ -21,7 +19,6 @@ RDEPEND=">=dev-libs/libusb-0.1.6
 	>=sys-apps/usbutils-0.11-r2
 	sys-apps/hotplug
 	jpeg? ( >=media-libs/libexif-0.5.9 )"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/patch-2.5.9
 	dev-util/pkgconfig
@@ -46,7 +43,6 @@ DEPEND="${RDEPEND}
 #
 [ -z "${GPHOTO_LIBS}" ] && GPHOTO_LIBS="all"
 
-
 src_unpack() {
 	unpack ${A}
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
@@ -69,7 +65,8 @@ src_compile() {
 	myconf="${myconf} `use_enable doc docs`"
 
 	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
+	# or the documentation fails.
+	emake -j1 || die "make failed"
 }
 
 src_install() {
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
index 46bcbbd936c7..f662234901a5 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild,v 1.9 2004/06/24 23:10:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild,v 1.10 2004/07/13 01:12:32 vapier Exp $
 
 inherit libtool eutils
 
-MAKEOPTS="${MAKEOPTS} -j1" # or the documentation fails.
-
-DESCRIPTION="Library that implements support for numerous digital cameras."
+DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
 SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
@@ -21,30 +19,25 @@ RDEPEND=">=dev-libs/libusb-0.1.6
 	>=sys-apps/usbutils-0.11-r2
 	sys-apps/hotplug
 	jpeg? ( >=media-libs/libexif-0.5.9 )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
 # By default, drivers for all supported cards will be compiled.
-# If you want to only compile for specific card(s), set GPHOTO_LIBS
+# 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.
-#
-# For example:
-#
-#   env GPHOTO_LIBS='canon,ptp2' emerge libgphoto2
-#
-# drivers: agfa-cl20, barbie, canon, casio, digita, dimera,
-#          directory, fuji, gsmart300, jamcam,
-#          jd11, kodak, konica, mustek, largan,
-#          minolta, panasonic, pccam300, pccam600,
-#          polaroid, ptp2, ricoh, samsung, smal,
-#          sierra, sipix, sonydscf1, sonydscf55,
-#          soundvision, spca50x, sq905, stv0680, sx330z
-#
-[ -z "${GPHOTO_LIBS}" ] && GPHOTO_LIBS="all"
-
+IUSE_CAMERAS="agfa-cl20 barbie canon casio digita dimera directory fuji gsmart300 jamcam jd11 
+kodak konica mustek largan minolta panasonic pccam300 pccam600 polaroid ptp2 ricoh samsung 
+smal sierra sipix sonydscf1 sonydscf55 soundvision spca50x sq905 stv0680 sx330z"
+
+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
+}
 
 src_unpack() {
 	unpack ${A}
@@ -54,23 +47,30 @@ src_unpack() {
 }
 
 src_compile() {
+	local cameras
+	local cam
+	for cam in ${CAMERAS} ; do
+		has ${cam} ${IUSE_CAMERAS} && cameras="${cameras},${cam}"
+	done
+	[ -z "${cameras}" ] \
+		&& cameras="all" \
+		|| cameras="${cameras:1}"
+	einfo $cameras
+
 	elibtoolize
 
 	local myconf
 
 	myconf="--with-rpmbuild=/bin/false"
-
 	myconf="--with-drivers=${GPHOTO_LIBS}"
-
 	use jpeg \
 		&& myconf="${myconf} --with-exif-prefix=/usr" \
 		|| myconf="${myconf} --without-exif"
-
 	myconf="${myconf} `use_enable nls`"
 	myconf="${myconf} `use_enable doc docs`"
-
 	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
+	# or the documentation fails.
+	emake -j1 || die "make failed"
 }
 
 src_install() {