Index: libgphoto2-2.2.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v
retrieving revision 1.6
diff -u -B -r1.6 libgphoto2-2.2.1-r1.ebuild
--- libgphoto2-2.2.1-r1.ebuild	7 Nov 2006 12:03:11 -0000	1.6
+++ libgphoto2-2.2.1-r1.ebuild	7 Dec 2006 10:48:09 -0000
@@ -118,6 +118,11 @@
 	fi
 
 	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}"
+
 		HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap"
 		HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi"
 
@@ -125,13 +130,15 @@
 			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}
-			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list usb-usermap >> ${D}/${HOTPLUG_USERMAP}
-
+			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list usb-usermap >> ${D}/${HOTPLUG_USERMAP} \
+				|| die "failed to create usb-usermap"
 		fi
 
 		if use hal; then
 			einfo "Generating HAL FDI files ..."
-			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> ${D}/${HAL_FDI}
+			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
 	else
 		eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-camera-list"