[patch] patch 2.1.6-r2 ebuild to 2.2.1 ebuild

libgphoto2-2.2.1.ebuild.patch (text/plain), 1.93 KB, created by Sander van Grieken on 2006-06-23 15:31:57 UTC

--- /usr/portage/media-libs/libgphoto2/libgphoto2-2.1.6-r2.ebuild	2006-02-10 14:17:51.000000000 +0100
+++ media-libs/libgphoto2/libgphoto2-2.2.1.ebuild	2006-06-24 00:32:05.000000000 +0200
@@ -11,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls doc exif nousb"
+IUSE="nls doc exif nousb kernel_linux"
 
 # needs >usbutils-0.11-r2 to avoid /usr/lib/libusb*
 # conflicts with dev-libs/libusb
@@ -47,7 +47,8 @@
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
+	epatch ${FILESDIR}/${PN}-2.2.1-norpm.patch
+	epatch ${FILESDIR}/${PN}-2.2.1-usbid.patch
 
 	# make default group 'plugdev', not camera
 	sed -e 's:=camera:=plugdev:' -i packaging/linux-hotplug/usbcam.group
@@ -119,15 +120,15 @@
 	if use !nousb && use kernel_linux; then
 		einfo "Generating usbcam-gphoto2.usermap .."
 		HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap"
-		if [[ -x ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap ]]; then
+		if [[ -x ${ROOT}/usr/$(get_libdir)/libgphoto2/print-camera-list ]]; then
 			echo "# !!! DO NOT EDIT THIS FILE !!! This file is automatically generated." > ${ROOT}/${HOTPLUG_USERMAP}
 			echo "# Put your custom entries in /etc/hotplug/usb/usbcam.usermap" >> ${ROOT}/${HOTPLUG_USERMAP}
-			${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap >> ${ROOT}/${HOTPLUG_USERMAP}
+			${ROOT}/usr/$(get_libdir)/libgphoto2/print-camera-list usb-usermap >> ${ROOT}/${HOTPLUG_USERMAP}
 		else
-			eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap"
+			eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-camera-list"
 			eerror "and therefore unable to generate hotplug usermap."
 			eerror "You will have to manually generate it by running:"
-			eerror " /usr/$(get_libdir)/libgphoto2/print-usb-usermap > ${HOTPLUG_USERMAP}"
+			eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list usb-usermap > ${HOTPLUG_USERMAP}"
 		fi
 	fi