Fixed forced --as-needed issue, was already in itf-ldadd patch, bug #247904. Fix udev rules and make it mutlilib aware. Clean up old revisions.

(Portage version: 2.2_rc18/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 44 insertions, 50 deletions

diff --git a/media-video/isight-firmware-tools/files/ift-ldadd.diff b/media-video/isight-firmware-tools/files/ift-ldadd.diff
deleted file mode 100644
index e71bd670d6b9..000000000000
--- a/media-video/isight-firmware-tools/files/ift-ldadd.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Nur src.orig/Makefile.am src/Makefile.am
---- src.orig/Makefile.am	2007-12-29 15:38:01.000000000 +0100
-+++ src/Makefile.am	2007-12-29 15:38:27.000000000 +0100
-@@ -5,13 +5,13 @@
- # extractor
- ift_extract_SOURCES = extract.c
- ift_extract_CFLAGS = $(IFT_CFLAGS) $(AM_CFLAGS)
--ift_extract_LDFLAGS = $(IFT_LIBS) -lgcrypt
-+ift_extract_LDADD = $(IFT_LIBS) -lgcrypt
- 
- 
- # export
- ift_export_SOURCES = export.c
- ift_export_CFLAGS = $(IFT_CFLAGS) $(AM_CFLAGS)
--ift_export_LDFLAGS = $(IFT_LIBS)
-+ift_export_LDADD = $(IFT_LIBS)
- 
- libudevdir = ${libdir}/udev
- libudev_PROGRAMS = ift-load
-@@ -19,4 +19,4 @@
- # loader
- ift_load_SOURCES = load.c
- ift_load_CFLAGS = $(IFT_CFLAGS) $(LOAD_CFLAGS) $(AM_CFLAGS)
--ift_load_LDFLAGS = $(IFT_LIBS) $(LOAD_LIBS)
-+ift_load_LDADD = $(IFT_LIBS) $(LOAD_LIBS)
-diff -Nur src.orig/Makefile.in src/Makefile.in
---- src.orig/Makefile.in	2007-12-29 15:38:01.000000000 +0100
-+++ src/Makefile.in	2007-12-29 15:38:27.000000000 +0100
-@@ -215,18 +215,18 @@
- # extractor
- ift_extract_SOURCES = extract.c
- ift_extract_CFLAGS = $(IFT_CFLAGS) $(AM_CFLAGS)
--ift_extract_LDFLAGS = $(IFT_LIBS) -lgcrypt
-+ift_extract_LDADD = $(IFT_LIBS) -lgcrypt
- 
- # export
- ift_export_SOURCES = export.c
- ift_export_CFLAGS = $(IFT_CFLAGS) $(AM_CFLAGS)
--ift_export_LDFLAGS = $(IFT_LIBS)
-+ift_export_LDADD = $(IFT_LIBS)
- libudevdir = ${libdir}/udev
- 
- # loader
- ift_load_SOURCES = load.c
- ift_load_CFLAGS = $(IFT_CFLAGS) $(LOAD_CFLAGS) $(AM_CFLAGS)
--ift_load_LDFLAGS = $(IFT_LIBS) $(LOAD_LIBS)
-+ift_load_LDADD = $(IFT_LIBS) $(LOAD_LIBS)
- all: all-am
- 
- .SUFFIXES:
diff --git a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.2-ift-ldadd.patch b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.2-ift-ldadd.patch
new file mode 100644
index 000000000000..496c4c6bc642
--- /dev/null
+++ b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.2-ift-ldadd.patch
@@ -0,0 +1,36 @@
+--- a/src/Makefile.am	2008-12-24 12:22:22.059204647 +0100
++++ b/src/Makefile.am	2008-12-24 12:24:04.267205731 +0100
+@@ -5,13 +5,13 @@
+ # extractor
+ ift_extract_SOURCES = extract.c
+ ift_extract_CFLAGS = $(IFT_CFLAGS) $(AM_CFLAGS)
+-ift_extract_LDFLAGS = $(IFT_LIBS) -lgcrypt
++ift_extract_LDADD = $(IFT_LIBS) -lgcrypt
+ 
+ 
+ # export
+ ift_export_SOURCES = export.c
+ ift_export_CFLAGS = $(IFT_CFLAGS) $(AM_CFLAGS)
+-ift_export_LDFLAGS = $(IFT_LIBS)
++ift_export_LDADD = $(IFT_LIBS)
+ 
+ # UDEV
+ libudevdir = ${libdir}/udev
+@@ -23,7 +23,7 @@
+ 
+ ift_load_SOURCES = udev.c load.c load.h
+ ift_load_CFLAGS = $(IFT_CFLAGS) $(LOAD_CFLAGS) $(AM_CFLAGS)
+-ift_load_LDFLAGS = $(IFT_LIBS) $(LOAD_LIBS)
++ift_load_LDADD = $(IFT_LIBS) $(LOAD_LIBS)
+ 
+ rulesdir = ${sysconfdir}/udev/rules.d
+ rules_DATA =
+@@ -45,7 +45,7 @@
+ # HAL loader
+ ift_callout_SOURCES = callout.c load.c load.h
+ ift_callout_CFLAGS = $(IFT_CFLAGS) $(LOAD_CFLAGS) $(HAL_CFLAGS) $(AM_CFLAGS)
+-ift_callout_LDFLAGS = $(IFT_LIBS) $(LOAD_LIBS) $(HAL_LIBS)
++ift_callout_LDADD = $(IFT_LIBS) $(LOAD_LIBS) $(HAL_LIBS)
+ 
+ 50-isight-firmware.fdi: isight-firmware.fdi
+ 	cp $< $@
diff --git a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.2-rules.patch b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.2-rules.patch
new file mode 100644
index 000000000000..cc7ad436db63
--- /dev/null
+++ b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.2-rules.patch
@@ -0,0 +1,8 @@
+--- a/src/isight.rules.in	2008-12-24 12:00:21.943219661 +0100
++++ b/src/isight.rules.in	2008-12-24 12:04:07.788237004 +0100
+@@ -1 +1,4 @@
+-ACTION=="add", SYSFS{idVendor}=="05ac", SYSFS{idProduct}=="8300", RUN+="@udevdir@/ift-load --firmware /lib/firmware/isight.fw"
++#
++# iSight rules
++
++ACTION=="add", SYSFS{idVendor}=="05ac", SYSFS{idProduct}=="8300", RUN+="@libdir@/udev/ift-load -b %s{busnum} -d %s{devnum} --firmware /lib/firmware/isight.fw"