Fix udev rules for kernel 2.6.22 and greater, now also got this patch into upstream - will appear in next version.

Package-Manager: portage-2.1.3.9

5 files changed, 207 insertions, 8 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 8acb87342ba3..48dbb3defd17 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.107 2007/09/25 06:39:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.108 2007/09/26 13:24:20 zzam Exp $
+
+*libgphoto2-2.4.0-r1 (26 Sep 2007)
+
+  26 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libgphoto2-2.4.0-udev-rules-fix4.diff, +libgphoto2-2.4.0-r1.ebuild:
+  Fix udev rules for kernel 2.6.22 and greater, now also got this patch into
+  upstream - will appear in next version.
 
   25 Sep 2007; Gilles Dartiguelongue <eva@gentoo.org>
   libgphoto2-2.4.0.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index ed55beaf63e9..5637c3e40bac 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -45,6 +45,10 @@ AUX libgphoto2-2.4.0-rpm.patch 452 RMD160 694c3f602a6b20fbcd135586d69551e335328f
 MD5 e99cd430f70587365b343c814f6a4ed0 files/libgphoto2-2.4.0-rpm.patch 452
 RMD160 694c3f602a6b20fbcd135586d69551e335328f84 files/libgphoto2-2.4.0-rpm.patch 452
 SHA256 39501ccdfc6c780b3aa6a105584b32e9e4a6ad7195a14a341210be9f2e871149 files/libgphoto2-2.4.0-rpm.patch 452
+AUX libgphoto2-2.4.0-udev-rules-fix4.diff 702 RMD160 5b71a415ce30c4921337c7c797a24dbd53e685b0 SHA1 2a074a84f7fe5ee3c4539eb7793c935637cce0bf SHA256 1b75fd6acaa07e511a5a32d5fa0fc7d0b5a24911c23796836223a0279f33e27e
+MD5 5a730743fdf73d6cb2d7b1fc27e51b89 files/libgphoto2-2.4.0-udev-rules-fix4.diff 702
+RMD160 5b71a415ce30c4921337c7c797a24dbd53e685b0 files/libgphoto2-2.4.0-udev-rules-fix4.diff 702
+SHA256 1b75fd6acaa07e511a5a32d5fa0fc7d0b5a24911c23796836223a0279f33e27e files/libgphoto2-2.4.0-udev-rules-fix4.diff 702
 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
 DIST libgphoto2-2.4.0.tar.bz2 3180009 RMD160 4cba4247bd7e4f9334f2f6bda649b343007da775 SHA1 cad25aa281e0749e7f1c83a3715b421f98b0981f SHA256 0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79
@@ -68,14 +72,18 @@ EBUILD libgphoto2-2.3.1-r5.ebuild 5314 RMD160 1904f96dacfb257e2ba8c1e48381c45d13
 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
+EBUILD libgphoto2-2.4.0-r1.ebuild 5642 RMD160 f9fb9f03d63f0c4ec0b77279068eddf5c8fdb883 SHA1 bded7d395d5ceab540b3c5b3beaed0f4c3cf893e SHA256 ee2a2cf2172b5b341c88c94dfb22fa18219b043ac7b5edaca4780cf8525e5eb4
+MD5 e073d3657a3420d570216a2c81188e71 libgphoto2-2.4.0-r1.ebuild 5642
+RMD160 f9fb9f03d63f0c4ec0b77279068eddf5c8fdb883 libgphoto2-2.4.0-r1.ebuild 5642
+SHA256 ee2a2cf2172b5b341c88c94dfb22fa18219b043ac7b5edaca4780cf8525e5eb4 libgphoto2-2.4.0-r1.ebuild 5642
 EBUILD libgphoto2-2.4.0.ebuild 5540 RMD160 80330c2a9fa718e0261ad558d31d784038b0e269 SHA1 35bb55560b6467195b4de396208028ad20305a98 SHA256 f02806934e99d6756a907dc65a6155b33f05231422121811f91b3fdbb41c2f66
 MD5 31cad3168ae7c255f82c2dae2d57367c libgphoto2-2.4.0.ebuild 5540
 RMD160 80330c2a9fa718e0261ad558d31d784038b0e269 libgphoto2-2.4.0.ebuild 5540
 SHA256 f02806934e99d6756a907dc65a6155b33f05231422121811f91b3fdbb41c2f66 libgphoto2-2.4.0.ebuild 5540
-MISC ChangeLog 17860 RMD160 21fdd663ba5508e1a8a43d64839eb38636062381 SHA1 a60855788e0588127ccb5331916c80ac544c44c7 SHA256 0fb81597a3534c5f024de5281a9b73783ad889581437aca405d8d2e3b35497dc
-MD5 773c4834075144cc1bb8f27c05a38938 ChangeLog 17860
-RMD160 21fdd663ba5508e1a8a43d64839eb38636062381 ChangeLog 17860
-SHA256 0fb81597a3534c5f024de5281a9b73783ad889581437aca405d8d2e3b35497dc ChangeLog 17860
+MISC ChangeLog 18147 RMD160 8092561b267576487d7148eb83662eb0138518aa SHA1 2f2ab09aaa61c1e0ba7c19e05b418a958af1eb8e SHA256 f0b5c19667b73dfe817507ba7eb0ffe401f7d3d6839ea164d15c8f6a71819120
+MD5 854a499126d6136f165ae012868a636b ChangeLog 18147
+RMD160 8092561b267576487d7148eb83662eb0138518aa ChangeLog 18147
+SHA256 f0b5c19667b73dfe817507ba7eb0ffe401f7d3d6839ea164d15c8f6a71819120 ChangeLog 18147
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
 MD5 7f9a9f03e32d907819c6891242037f7c metadata.xml 182
 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 metadata.xml 182
@@ -98,10 +106,13 @@ SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/di
 MD5 fe1406182385e3183e892136f820991a files/digest-libgphoto2-2.4.0 256
 RMD160 7d12c514df1bf2257fbc731880580bddc5b0ec6c files/digest-libgphoto2-2.4.0 256
 SHA256 f1c96a5b69af736e43e71fd4a9c4eb20cca97bb5b699a8276b1d70c7139af2f4 files/digest-libgphoto2-2.4.0 256
+MD5 fe1406182385e3183e892136f820991a files/digest-libgphoto2-2.4.0-r1 256
+RMD160 7d12c514df1bf2257fbc731880580bddc5b0ec6c files/digest-libgphoto2-2.4.0-r1 256
+SHA256 f1c96a5b69af736e43e71fd4a9c4eb20cca97bb5b699a8276b1d70c7139af2f4 files/digest-libgphoto2-2.4.0-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG+K0n1fmVwcYIWAYRAmiRAJ4/xKtVulhZCTzlYkM9p0Kn+MnbMgCeJXdI
-BbKk17ntis0kGE8673omLjQ=
-=SUMH
+iD8DBQFG+l2Ot2vP6XvVdOcRAqZ1AKDk0qrainXq70wTL25Ancbt2SVwYgCg14dN
+ZL8wTC0kCDHv/VCP57QyEg0=
+=EoPD
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0-r1 b/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0-r1
new file mode 100644
index 000000000000..d6f9ffd6b2d9
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0-r1
@@ -0,0 +1,3 @@
+MD5 a60154772635b693ff08b4f34dea7f61 libgphoto2-2.4.0.tar.bz2 3180009
+RMD160 4cba4247bd7e4f9334f2f6bda649b343007da775 libgphoto2-2.4.0.tar.bz2 3180009
+SHA256 0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79 libgphoto2-2.4.0.tar.bz2 3180009
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.0-udev-rules-fix4.diff b/media-libs/libgphoto2/files/libgphoto2-2.4.0-udev-rules-fix4.diff
new file mode 100644
index 000000000000..878e3b977121
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.4.0-udev-rules-fix4.diff
@@ -0,0 +1,12 @@
+diff -ru libgphoto2-2.4.0-orig/packaging/generic/print-camera-list.c libgphoto2-2.4.0/packaging/generic/print-camera-list.c
+--- libgphoto2-2.4.0-orig/packaging/generic/print-camera-list.c	2007-09-26 15:04:29.133025885 +0200
++++ libgphoto2-2.4.0/packaging/generic/print-camera-list.c	2007-09-26 15:06:49.639775971 +0200
+@@ -444,7 +444,7 @@
+ 		"BUS!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
+ 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
+ 		/* UDEV_0_98 */
+-		"SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
++		"SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
+ 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"
+ 	};
+ 	static char *usbcam_strings[] = {
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..4e136f92ab7a
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
@@ -0,0 +1,166 @@
+# 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.4.0-r1.ebuild,v 1.1 2007/09/26 13:24:20 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 autotools
+
+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 casio_qv clicksmart310
+digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick
+jamcam jd11 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200
+konica konika_qm150 largan lg_gsm mars dimagev mustek panasonic_coolshot
+panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600
+polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung
+sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55
+soundvision spca50x sq905 stv0674 stv0680 sx330z template toshiba_pdrm11"
+
+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
+
+	if use cameras_template || use cameras_sipix_blink; then
+		einfo "Upstream considers sipix_blink & template driver as obsolete"
+	fi
+
+	enewgroup plugdev || die "Error creating plugdev group"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-rpm.patch
+
+	# Fix as-needed at configure time
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	# Fix udev rules for Kernel 2.6.22 and greater
+	epatch "${FILESDIR}"/${P}-udev-rules-fix4.diff
+
+	AT_M4DIR="${S}/auto-m4 ${S}/m4m" eautoreconf
+}
+
+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"
+
+	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
+
+	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 version 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 version 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."
+}