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.

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

9 files changed, 121 insertions, 162 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/Manifest b/media-video/isight-firmware-tools/Manifest
index ef8f3e3edcef..e6fc758270ae 100644
--- a/media-video/isight-firmware-tools/Manifest
+++ b/media-video/isight-firmware-tools/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ift-ldadd.diff 1554 RMD160 37850c00912ff7e67d54012456ac9b2174bb00ae SHA1 7b0576745b08d4970b879fe88d97c93423bececf SHA256 2945cc6f2647fbc20dc9402de3f1bf1c8b82817ac425e2cf96610ee9233ba3e9
-DIST isight-firmware-tools-0.5.1.1.tar.gz 263698 RMD160 3cfbf3cc61486a1624736b89ee459d093c0f43d5 SHA1 5e737450f6424067b54c3a4f981a6cf3fff3b19a SHA256 9ffcc90691cb89b256b59e54b3362241760037f34b3f95f9aba9a7df169a507d
-DIST isight-firmware-tools-1.0.2.tar.gz 264714 RMD160 befd12e4c46d9507dd8da1a7850402967c342889 SHA1 a19b7f89d280425abf9fff8f278e3a342e3c8b39 SHA256 486de32a1651fb58d6fa913c3a100ea96b1a2e77283631ea8d40e359cee24336
-DIST isight-firmware-tools-1.0.tar.gz 264537 RMD160 14a556b4f166df46d3f51e9fdc6429272de976f3 SHA1 c12442d1f5e0142790fc1a57113e559a06c8f51f SHA256 a9ab0eba062b398927581adca478cab1013b5139820378826fd4d27f932e7d23
+AUX isight-firmware-tools-1.2-ift-ldadd.patch 1111 RMD160 452155f4ffc1ee8ba36c448907faea466478e564 SHA1 d0c2d96fd3343f5547e8877cbce5ec50ed4b3c44 SHA256 f8a5e930be8c724a9e86041cddd379ae3fbfcac2b852d690ed9ace4106499688
+AUX isight-firmware-tools-1.2-rules.patch 447 RMD160 8f16d3b1504c528564ce47a32b36eb3ec50ebf2a SHA1 46e26f5022056dc58bc56d1f6433f7d7be8f08e4 SHA256 73c2682975ebaba4c0fa71c9155653f89d7956d6773c753485a9928c31808a83
 DIST isight-firmware-tools-1.2.tar.gz 283214 RMD160 af9e7e84a25664e93c5ad3c1c35e5ca3e9787905 SHA1 6c1c3293bd98f5e828d8df569a44a2dd35343ef7 SHA256 826419e2eda0a9bc381b115832a4dda44cc47549eb8350c62f948968aaee58b9
-EBUILD isight-firmware-tools-0.5.1.1.ebuild 1008 RMD160 7faab16eef82bd2fab737c55975fcedcc948dee6 SHA1 6b63870319fe6198b979613395689a132cadc892 SHA256 696d9f52f1fc1a273025f4066e678989f9e22b3185cdd0640854ca6fdbb93234
-EBUILD isight-firmware-tools-1.0.2.ebuild 1097 RMD160 31974c4bf7f0cad7263833c5a8bbee35a94007c1 SHA1 50ba58d89f4f809174fb6dfc72db727f343f5435 SHA256 0925ace60f741416c0cbe9fafdb3562528f78c873e0066b9908ec2b915183b1e
-EBUILD isight-firmware-tools-1.0.ebuild 1095 RMD160 b28915d7a244df4667503ca76082d0e81c56e226 SHA1 c37252a49f26eb2e27b1651466a3505a1c7ea579 SHA256 274f5beaca378475c31bb3dd632e259d00f578968ed10291d9aa289f80066e8d
+EBUILD isight-firmware-tools-1.2-r1.ebuild 1783 RMD160 7be4d1088bf8ff707b7cdb68729672d6989ab325 SHA1 02d975eb44152ea6bedc493c19d5a8e230f506d8 SHA256 6c0c1ebfa4fdeda250ec08e1f6c3c018a5970f8745b73cfffdf837e0135b569c
 EBUILD isight-firmware-tools-1.2.ebuild 1275 RMD160 5d110c6baa5925aece46b17e3b47250031cb6c10 SHA1 d4143f129769f90afc66338a8330b6bc16059ef9 SHA256 78ad95259a11cd75aa35ebbe8105077dd7517558596841ae4cd9bd21f4c712fc
-MISC ChangeLog 1106 RMD160 9f05f254e9c28b018bfed724a7adfdca6e6cae48 SHA1 4ad2251338876cfda792deca1ef0a376cd65e20b SHA256 8f046ae19f579ca6924f69f28664298413cacd7bb72a277f0038792d1f079999
+MISC ChangeLog 1632 RMD160 057175413fdd2859b25fae885b481f17a7a2e951 SHA1 031e51e127a2c9b608e45da328b326156a596d99 SHA256 afcb4e2c9885098dd904469f8b6ea2e01d8290c424d57a63da48a60c7f5d4fb6
 MISC metadata.xml 280 RMD160 e6e2ba5d4a79b5fdf0edd7141b148049770f8e97 SHA1 cd693373bb3d28481fd9d5511d987656b94c9772 SHA256 b8c5566fa0cf8c90ad766b9e5c10c2e8191d1341efc7aac171117073a74c7cb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiWCYcACgkQ1fmVwcYIWAY/gQCg4LaBO3S5MParffCuu26BfW3E
-80AAoOF4VmVesJVa4tn9AFz66huzMup1
-=JfKG
+iEYEARECAAYFAklSIc8ACgkQ1fmVwcYIWAakkwCfeJ5f04Q7Xxa9+HBrRlHL9R/H
+sDoAn3Wo/+oB40joVLLpZmrz1c8GU1ad
+=+eYF
 -----END PGP SIGNATURE-----
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"
+}