From: Marinus Schraal <foser@gentoo.org>
Date: Mon, 17 Jan 2005 13:09:55 +0000 (+0000)
Subject: add patch to find gphoto2 usermap
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e490307f8c8137d4edc6d5c77ff8f6d0cc81b80b;p=gentoo.git

add patch to find gphoto2 usermap
---

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 455d6df26840..d33c898bf2c8 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.24 2005/01/13 09:50:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.25 2005/01/17 13:09:55 foser Exp $
+
+*hal-0.4.5-r1 (17 Jan 2005)
+
+  17 Jan 2005; foser <foser@gentoo.org> hal-0.4.5-r1.ebuild :
+  Add patch to find the gphoto2 usermap (#75799)
 
 *hal-0.4.5 (13 Jan 2005)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index f65c9e614068..077774b8bf36 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,9 +1,9 @@
 MD5 faaf821c60bf4b6c663caeace3e21a95 hal-0.4.2-r1.ebuild 2728
+MD5 3421ea82543d71c44ee06c3f9605d775 hal-0.4.5-r1.ebuild 2592
 MD5 f6c71019d8f7b2dab5ef13de1abd9244 hal-0.4.1-r1.ebuild 2567
 MD5 8a56df2be3b94b0e0e958c48e6c14df5 hal-0.2.98-r1.ebuild 2102
 MD5 4de36bde0054e10e722225fe4ffd6c6b hal-0.4.4-r1.ebuild 2758
-MD5 4cf759c01af0d694ce5dc082bcfd3864 hal-0.4.5.ebuild 2505
-MD5 377a6a4f274fb9a1906e99a0f1772628 ChangeLog 3593
+MD5 92855632db95579688246bf8605a2c10 ChangeLog 3734
 MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
 MD5 2396bfac6dd9b68615328b1b9325ed2c files/hal-0.4.4-iso_label_selection.patch 1541
@@ -12,10 +12,11 @@ MD5 72d398ab014b2630043ef2a4d9990e2f files/digest-hal-0.2.98-r1 63
 MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1-r1 62
 MD5 a9afa7e41b21ea5f012765a8ced6c10d files/digest-hal-0.4.2-r1 62
 MD5 11d67cf37182e289664f50de3ee6172f files/digest-hal-0.4.4-r1 62
+MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r1 62
 MD5 0693dbefb790150740986cce82039b82 files/hal-0.4.2-cdrom_media_check.patch 1194
 MD5 399570c945e0f4bffbeb645e057e027b files/hal-0.4.1-dm_devices_tab.patch 1028
-MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5 62
 MD5 314ebeadb0a53e448e74ad6a3eead3f8 files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch 1920
 MD5 2b00af86c624d74107035a007ac3c9da files/hal-0.4.4-volume_id_fat.patch 849
+MD5 b0e12a62ce698e1eb2a32139498330cd files/hal-0.4.5-gentoo_gphoto2_usermap.patch 817
 MD5 eeb1838cdb78726ab674194f0d268270 files/hal-0.4.2-fstab_sync_crash.patch 468
 MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
diff --git a/sys-apps/hal/files/digest-hal-0.4.5 b/sys-apps/hal/files/digest-hal-0.4.5-r1
similarity index 100%
rename from sys-apps/hal/files/digest-hal-0.4.5
rename to sys-apps/hal/files/digest-hal-0.4.5-r1
diff --git a/sys-apps/hal/files/hal-0.4.5-gentoo_gphoto2_usermap.patch b/sys-apps/hal/files/hal-0.4.5-gentoo_gphoto2_usermap.patch
new file mode 100644
index 000000000000..a2dcaccdf362
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.5-gentoo_gphoto2_usermap.patch
@@ -0,0 +1,12 @@
+diff -x '*~' -uNr hal-0.4.5/tools/linux/hal_hotplug_map.c hal-0.4.5.patched/tools/linux/hal_hotplug_map.c
+--- hal-0.4.5/tools/linux/hal_hotplug_map.c	2004-09-27 16:52:11.000000000 +0200
++++ hal-0.4.5.patched/tools/linux/hal_hotplug_map.c	2005-01-17 13:29:04.040385408 +0100
+@@ -19,7 +19,7 @@
+ #define dbg(...) do {if (verbose) fprintf (stderr, __VA_ARGS__);} while (0)
+ 
+ /* @todo FIXME HACK: it's a hack to hardcode this */
+-static const char *usbmapfiles[] = {"/etc/hotplug/usb.usermap", "/etc/hotplug/usb/libsane.usermap", "/etc/hotplug/usb/libgphoto2.usermap",  NULL};
++static const char *usbmapfiles[] = {"/etc/hotplug/usb.usermap", "/etc/hotplug/usb/libsane.usermap", "/etc/hotplug/usb/libgphoto2.usermap", "/etc/hotplug/usb/usbcam-gphoto2.usermap",  NULL};
+ 
+ static int
+ handle_usb_found (const char *module)
diff --git a/sys-apps/hal/hal-0.4.5.ebuild b/sys-apps/hal/hal-0.4.5-r1.ebuild
similarity index 92%
rename from sys-apps/hal/hal-0.4.5.ebuild
rename to sys-apps/hal/hal-0.4.5-r1.ebuild
index fe6df196b360..46cc81c6f174 100644
--- a/sys-apps/hal/hal-0.4.5.ebuild
+++ b/sys-apps/hal/hal-0.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.5.ebuild,v 1.1 2005/01/13 09:50:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.5-r1.ebuild,v 1.1 2005/01/17 13:09:55 foser Exp $
 
 inherit eutils python
 
@@ -37,6 +37,8 @@ src_unpack() {
 	cd ${S}
 	# remove pamconsole option
 	epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch
+	# pick up the gentoo usermap
+	epatch ${FILESDIR}/${P}-gentoo_gphoto2_usermap.patch
 
 }