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)

8 files changed, 114 insertions, 151 deletions

diff --git a/media-video/isight-firmware-tools/ChangeLog b/media-video/isight-firmware-tools/ChangeLog
index a876fe7b52d5..d26442f91bf8 100644
--- a/media-video/isight-firmware-tools/ChangeLog
+++ b/media-video/isight-firmware-tools/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/isight-firmware-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/ChangeLog,v 1.5 2008/08/03 19:39:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/ChangeLog,v 1.6 2008/12/24 11:49:21 eva Exp $
+
+*isight-firmware-tools-1.2-r1 (24 Dec 2008)
+
+  24 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/isight-firmware-tools-1.2-ift-ldadd.patch,
+  +files/isight-firmware-tools-1.2-rules.patch, -files/ift-ldadd.diff,
+  -isight-firmware-tools-0.5.1.1.ebuild, -isight-firmware-tools-1.0.ebuild,
+  -isight-firmware-tools-1.0.2.ebuild, +isight-firmware-tools-1.2-r1.ebuild:
+  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.
 
   03 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org> ChangeLog:
   remove hal from RDEPEND since it's not used
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"
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-0.5.1.1.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-0.5.1.1.ebuild
deleted file mode 100644
index a4faaf923f7f..000000000000
--- a/media-video/isight-firmware-tools/isight-firmware-tools-0.5.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-0.5.1.1.ebuild,v 1.1 2007/12/19 11:30:44 genstef Exp $
-
-DESCRIPTION="Extract, load or export firmware for the iSight webcams"
-HOMEPAGE="http://bersace03.free.fr/ift/"
-SRC_URI="http://bersace03.free.fr/ift/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-libs/glib
-	dev-libs/libusb
-	dev-libs/libgcrypt"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	elog "You need to extract your firmware prior to being able to loading it"
-	elog "ift-extract --apple-driver /macos/System/Library/Extensions/IOUSBFamily.kext/Contents/PlugIns/AppleUSBVideoSupport.kext/Contents/MacOS/AppleUSBVideoSupport"
-	elog "If you do not have OSX you can get AppleUSBVideoSupport from"
-	elog "http://www.mediafire.com/?81xtkqyttjt"
-}
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.0.2.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.0.2.ebuild
deleted file mode 100644
index 9d8ff13b61fb..000000000000
--- a/media-video/isight-firmware-tools/isight-firmware-tools-1.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-1.0.2.ebuild,v 1.1 2008/02/18 22:44:32 eva Exp $
-
-inherit eutils
-
-DESCRIPTION="Extract, load or export firmware for the iSight webcams"
-HOMEPAGE="http://bersace03.free.fr/ift/"
-SRC_URI="http://bersace03.free.fr/ift/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-libs/glib
-	dev-libs/libusb
-	dev-libs/libgcrypt"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/ift-ldadd.diff"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	elog "You need to extract your firmware prior to being able to loading it"
-	elog "ift-extract --apple-driver /macos/System/Library/Extensions/IOUSBFamily.kext/Contents/PlugIns/AppleUSBVideoSupport.kext/Contents/MacOS/AppleUSBVideoSupport"
-	elog "If you do not have OSX you can get AppleUSBVideoSupport from"
-	elog "http://www.mediafire.com/?81xtkqyttjt"
-}
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.0.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.0.ebuild
deleted file mode 100644
index 43f8461e530d..000000000000
--- a/media-video/isight-firmware-tools/isight-firmware-tools-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-1.0.ebuild,v 1.2 2008/02/18 22:44:32 eva Exp $
-
-inherit eutils
-
-DESCRIPTION="Extract, load or export firmware for the iSight webcams"
-HOMEPAGE="http://bersace03.free.fr/ift/"
-SRC_URI="http://bersace03.free.fr/ift/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-libs/glib
-	dev-libs/libusb
-	dev-libs/libgcrypt"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/ift-ldadd.diff"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	elog "You need to extract your firmware prior to being able to loading it"
-	elog "ift-extract --apple-driver /macos/System/Library/Extensions/IOUSBFamily.kext/Contents/PlugIns/AppleUSBVideoSupport.kext/Contents/MacOS/AppleUSBVideoSupport"
-	elog "If you do not have OSX you can get AppleUSBVideoSupport from"
-	elog "http://www.mediafire.com/?81xtkqyttjt"
-}
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild
new file mode 100644
index 000000000000..b9ba7b133c60
--- /dev/null
+++ b/media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild,v 1.1 2008/12/24 11:49:21 eva Exp $
+
+inherit autotools eutils multilib
+
+DESCRIPTION="Extract, load or export firmware for the iSight webcams"
+HOMEPAGE="http://bersace03.free.fr/ift/"
+SRC_URI="http://launchpad.net/${PN}/main/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib
+	dev-libs/libusb
+	dev-libs/libgcrypt"
+#	>=sys-apps/hal-0.5.9"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.5
+	sys-apps/texinfo"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix forced as-needed build, bug #247904
+	epatch "${FILESDIR}/${P}-ift-ldadd.patch"
+
+	# Fix udev rules for firmware loading
+	epatch "${FILESDIR}/${P}-rules.patch"
+
+	sed "s:/lib/firmware:/$(get_libdir)/firmware:" \
+		-i src/isight.rules.in || die "sed failed"
+
+	eautomake
+}
+
+src_compile() {
+	# https://bugs.launchpad.net/isight-firmware-tools/+bug/243255
+	econf --enable-udev --disable-hal --docdir=/usr/share/doc/${P}
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	mv "${D}"/etc/udev/rules.d/isight.rules "${D}"/etc/udev/rules.d/70-isight.rules
+	rm -f "${D}/usr/share/doc/${P}/HOWTO"
+	dodoc AUTHORS ChangeLog HOWTO NEWS README
+}
+
+pkg_postinst() {
+	elog "You need to extract your firmware prior to being able to loading it"
+	elog "ift-extract --apple-driver /macos/System/Library/Extensions/IOUSBFamily.kext/Contents/PlugIns/AppleUSBVideoSupport.kext/Contents/MacOS/AppleUSBVideoSupport"
+	elog "If you do not have OSX you can get AppleUSBVideoSupport from"
+	elog "http://www.mediafire.com/?81xtkqyttjt"
+}