Updated udev rules, to work with kernel 2.6.22. This uses new udev-syntax, so block versions before udev-114.

Package-Manager: portage-2.1.3.6

5 files changed, 225 insertions, 5 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index b75fa19ee79b..604301d86983 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.103 2007/07/02 15:08:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.104 2007/08/18 15:28:04 zzam Exp $
+
+*libgphoto2-2.3.1-r5 (18 Aug 2007)
+
+  18 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libgphoto2-2.3.1-udev-rules-fix3.diff, +libgphoto2-2.3.1-r5.ebuild:
+  Updated udev rules, to work with kernel 2.6.22. This uses new udev-syntax,
+  so block versions before udev-114.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   libgphoto2-2.2.1-r1.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index c6522c4a5ad9..c4e202b5b2d8 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgphoto-2.2.1-new-dbus-api.patch 388 RMD160 c9628553114c0d3eebc9a830496b89f56b65d5f7 SHA1 ccdd043a53a48b2045867b707447d1c0852fb6f7 SHA256 867ee5a0e627e1823b8637553d7ce4d6b1a3ef2dc5977f25d42f55bb71d32615
 MD5 5e4ad7afece31a2e6e13e201de18df01 files/libgphoto-2.2.1-new-dbus-api.patch 388
 RMD160 c9628553114c0d3eebc9a830496b89f56b65d5f7 files/libgphoto-2.2.1-new-dbus-api.patch 388
@@ -30,6 +33,10 @@ AUX libgphoto2-2.3.1-udev-rules-fix2.diff 1229 RMD160 7c3554375290275d168a37da9d
 MD5 2f5934149c4d9c8575bf5a9b097cd07a files/libgphoto2-2.3.1-udev-rules-fix2.diff 1229
 RMD160 7c3554375290275d168a37da9dd6ea5cf99315cd files/libgphoto2-2.3.1-udev-rules-fix2.diff 1229
 SHA256 9267360943445d268695d749bf9e16de310afa77e2b5afd6abfa67fcc21b2075 files/libgphoto2-2.3.1-udev-rules-fix2.diff 1229
+AUX libgphoto2-2.3.1-udev-rules-fix3.diff 1240 RMD160 2c8860703549ed7ff9bea6973126e226b097c9f2 SHA1 e64533f5b1ec8e03bd63198a165f23604d3f3ae9 SHA256 5f839d94b6ebe0cd10ff075e48fb61ea5d3f9d52e34e1e40e01030f29c9d40bb
+MD5 c4f99f7bd7136261579db45b72ec8661 files/libgphoto2-2.3.1-udev-rules-fix3.diff 1240
+RMD160 2c8860703549ed7ff9bea6973126e226b097c9f2 files/libgphoto2-2.3.1-udev-rules-fix3.diff 1240
+SHA256 5f839d94b6ebe0cd10ff075e48fb61ea5d3f9d52e34e1e40e01030f29c9d40bb files/libgphoto2-2.3.1-udev-rules-fix3.diff 1240
 DIST libgphoto2-2.2.1.tar.gz 4474022 RMD160 0b93ba1b6fe80c909623691f7a2452f01fa8832d SHA1 6636ae0020c201abaea74f9e3ea2d4bd404587c0 SHA256 2b8bdf357283951f990a05c8ffe897f57ddfa6be2bd1eca4253c13631405c9cf
 DIST libgphoto2-2.3.1.tar.bz2 3230934 RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 SHA1 13cc3f05ee298b33cd03ba4b772ef05a3aa49b97 SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727
 EBUILD libgphoto2-2.2.1-r1.ebuild 5333 RMD160 f1c1984ad2a4c756652c9d504f41422bbaa0eee2 SHA1 b2eb82ecc3aacdc59ddc4366e77313334d62e3da SHA256 94449dcf6a33385ca50ac4f36921b15d95d470733e277ce197ba5d2223ee6174
@@ -48,10 +55,14 @@ EBUILD libgphoto2-2.3.1-r4.ebuild 5278 RMD160 83a976e14fdf132cdf1c469c3fcd1b11f4
 MD5 d0f692e8171b405d347d69a2ed72d32e libgphoto2-2.3.1-r4.ebuild 5278
 RMD160 83a976e14fdf132cdf1c469c3fcd1b11f4f94104 libgphoto2-2.3.1-r4.ebuild 5278
 SHA256 85f52e9cbbd1567e223ac1b84103ae056f23e3390edbd5f9582a82d8e64b77ee libgphoto2-2.3.1-r4.ebuild 5278
-MISC ChangeLog 17098 RMD160 438fadc4a3c25b72ca634232d64716f9e5ccdc99 SHA1 c480b7611ff4bfd2af648426d819c30d846f5769 SHA256 6c58d789024ff9ba22a30bcb54f9fdb93fce2924dfe89d9799a9ebf711c2d255
-MD5 b143a7b346ebff53b4f7c3b09be3831a ChangeLog 17098
-RMD160 438fadc4a3c25b72ca634232d64716f9e5ccdc99 ChangeLog 17098
-SHA256 6c58d789024ff9ba22a30bcb54f9fdb93fce2924dfe89d9799a9ebf711c2d255 ChangeLog 17098
+EBUILD libgphoto2-2.3.1-r5.ebuild 5314 RMD160 1904f96dacfb257e2ba8c1e48381c45d1345ad58 SHA1 3f100d12ad340b6a49e7673b3a76b01bc6eea18f SHA256 529626d427a24e3d0e62471c9545ddc00a1e6308dbc212424491972a96fa324f
+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
+MISC ChangeLog 17378 RMD160 6479778b3879e4ecde6b0d911a0358c7962f2145 SHA1 52c06bdc479c9e75adf3d1c9cb2788f90fc709d0 SHA256 b4ba05d2a4138fa39ee70ab02ba90649247b62ad1928ce1a5e45a524ab6c9a88
+MD5 7319e4f07421bf1c30b78da6d2697782 ChangeLog 17378
+RMD160 6479778b3879e4ecde6b0d911a0358c7962f2145 ChangeLog 17378
+SHA256 b4ba05d2a4138fa39ee70ab02ba90649247b62ad1928ce1a5e45a524ab6c9a88 ChangeLog 17378
 MISC metadata.xml 239 RMD160 fbd40c52c44319ae783ab64e4e462df8a50ae80b SHA1 e72256b3e45caa0460211547277ce5fdc8f0fb78 SHA256 bd05dcbc8b28b3fda9782e3b139e3bc10657884df8e3df27e34a2fa6ac8ca403
 MD5 8759896f08364250aeb0f8199fe1c2aa metadata.xml 239
 RMD160 fbd40c52c44319ae783ab64e4e462df8a50ae80b metadata.xml 239
@@ -68,3 +79,13 @@ SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/di
 MD5 f59a564d9acf40c03e04fbadc8f52b1d files/digest-libgphoto2-2.3.1-r4 256
 RMD160 02bfc9e1c415b30e127ea38588f08e83c22beb73 files/digest-libgphoto2-2.3.1-r4 256
 SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/digest-libgphoto2-2.3.1-r4 256
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFGxxALt2vP6XvVdOcRAoc2AJkBavCUe1B77LxlDpPmu2TsXxNrvgCguPtZ
+rX0f6O0QFze1D/hCmL/bIqc=
+=wQUi
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r5 b/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r5
new file mode 100644
index 000000000000..770cf01bd000
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r5
@@ -0,0 +1,3 @@
+MD5 37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2 3230934
+RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 libgphoto2-2.3.1.tar.bz2 3230934
+SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727 libgphoto2-2.3.1.tar.bz2 3230934
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix3.diff b/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix3.diff
new file mode 100644
index 000000000000..31b00ac578a9
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix3.diff
@@ -0,0 +1,29 @@
+Index: libgphoto2-2.3.1/packaging/generic/print-camera-list.c
+===================================================================
+--- libgphoto2-2.3.1.orig/packaging/generic/print-camera-list.c
++++ libgphoto2-2.3.1/packaging/generic/print-camera-list.c
+@@ -299,7 +299,7 @@ udev_098_begin_func (const func_params_t
+ 	/* Note: 2 lines because we need to use || ... having them on the same
+ 	 * line would mean &&.
+ 	 */
+-	printf ("SUBSYSTEM!=\"usb*\", GOTO=\"libgphoto2_rules_end\"\n");
++	printf ("SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libgphoto2_rules_end\"\n");
+ 	printf ("ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n");
+ 	return 0;
+ }
+@@ -479,9 +479,14 @@ udev_098_camera_func (const func_params_
+ 			else
+ 				fprintf(stderr,"unhandled interface match flags %x\n", flags);
+ 		}
+-	} else {
++	} else if (flags & GP_USB_HOTPLUG_MATCH_VENDOR_ID) {
++			
+ 		printf ("ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ",
+ 			a->usb_vendor, a->usb_product);
++	} else {
++		fprintf(stderr, "Attempted to output rule for Camera: \"%s\" , Vendor: \"%04x\" , Product: \"%04x\"",
++				a->model, a->usb_vendor, a->usb_product);
++		return 0;
+ 	}
+ 	if ((*params->argv)[1] == NULL) {
+ 		const char *hotplug_script = ((*params->argv)[0] != NULL)
diff --git a/media-libs/libgphoto2/libgphoto2-2.3.1-r5.ebuild b/media-libs/libgphoto2/libgphoto2-2.3.1-r5.ebuild
new file mode 100644
index 000000000000..7eebd1f62763
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.3.1-r5.ebuild
@@ -0,0 +1,160 @@
+# 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.3.1-r5.ebuild,v 1.1 2007/08/18 15:28:04 zzam 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 multilib
+
+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 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"
+
+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
+
+	enewgroup plugdev || die "Error creating plugdev group"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-rpm.patch"
+
+	# Fix for udev >= 098 rules generation
+	epatch "${FILESDIR}"/${P}-udev-rules-fix3.diff
+}
+
+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"
+
+	CFLAGS="${CFLAGS} -DCANON_EXPERIMENTAL_20D"
+
+	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
+
+	# fixup udevscriptdir is not working TODO
+	dodir /lib
+	mv "${D}/usr/$(get_libdir)/udev" "${D}/lib" || die "Moving udev-helper files failed."
+	# 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-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-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."
+}