Fix udev rules, bug #316027. Fix build problem with -O0, bug #306803.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

8 files changed, 77 insertions, 174 deletions

diff --git a/media-video/isight-firmware-tools/ChangeLog b/media-video/isight-firmware-tools/ChangeLog
index 6971dd4bfbf8..91677423a157 100644
--- a/media-video/isight-firmware-tools/ChangeLog
+++ b/media-video/isight-firmware-tools/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-video/isight-firmware-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/ChangeLog,v 1.10 2010/02/24 22:20:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/ChangeLog,v 1.11 2010/05/05 22:07:00 eva Exp $
+
+*isight-firmware-tools-1.5.90-r1 (05 May 2010)
+
+  05 May 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/isight-firmware-tools-1.2-ift-ldadd.patch,
+  -files/isight-firmware-tools-1.2-rules.patch,
+  -isight-firmware-tools-1.4.2.ebuild,
+  -files/isight-firmware-tools-1.4.2-hal-disable.patch,
+  isight-firmware-tools-1.5.90.ebuild,
+  +isight-firmware-tools-1.5.90-r1.ebuild,
+  +files/isight-firmware-tools-1.5.90-build-O0.patch:
+  Fix udev rules, bug #316027. Fix build problem with -O0, bug #306803.
 
 *isight-firmware-tools-1.5.90 (24 Feb 2010)
 
diff --git a/media-video/isight-firmware-tools/Manifest b/media-video/isight-firmware-tools/Manifest
index a04a4f165d85..cf2901f055a3 100644
--- a/media-video/isight-firmware-tools/Manifest
+++ b/media-video/isight-firmware-tools/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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
-AUX isight-firmware-tools-1.4.2-hal-disable.patch 2590 RMD160 a18228de8037e3bf7792c09fafdfcabd112c47de SHA1 e3f3d1aef58c0f8403700c466c6d26ceb19f0f49 SHA256 9b0b9008b7c5e5a6a77f37acf4b258acee8f6756abfcbf818584535e61f154b8
-DIST isight-firmware-tools-1.4.2.tar.gz 285538 RMD160 dbb7537903bf17815b5784eb4850411dc3f77a54 SHA1 eba96100213ba3e89d9c0f32a0a2fc3b46e9e280 SHA256 2e3f743a8b11c5d9420e1a66f1b75f80cd5351b02d88605c0ea8b68139a9d8e8
+AUX isight-firmware-tools-1.5.90-build-O0.patch 1323 RMD160 aacf179a7117b48ffea4c418c031eb8a9ad7b23b SHA1 06a461bf2972f94a58fe341b9ac77e91024e656b SHA256 05958f4dc755992a62dc192e7ee85684dd9708a3ad4e0ff8c986c6c5f21eb2ac
 DIST isight-firmware-tools-1.5.90.tar.gz 285644 RMD160 34e6147b368ba02d2c8947b1d952e9f3c6fb990d SHA1 de26c68877fa2e95afe080bb71400093fd06a71b SHA256 5921dc730c9283e2dc451bea6b2ae65f51abddbcae7fc14d434aacc8992491c3
-EBUILD isight-firmware-tools-1.4.2.ebuild 1931 RMD160 eb94ef6c5eefd0920afe3d0df015f1c9d109a2d8 SHA1 7c8aac4c30a92a100f5d28be401d480a48626b0c SHA256 db55ad44c3907c8a7afae3bfb8bdc316797892a93f7b1f6d7adcc099d1211b5e
-EBUILD isight-firmware-tools-1.5.90.ebuild 1788 RMD160 6c13115b2512404ef8662e11086c220ef5c554eb SHA1 31eb856eeae4d068d878bde6aa7f7861f25e64a4 SHA256 2f7d6886573c0f37b3c8ddd2f5e60bf7fb7fec2c666d93b604cd4eb6617d703c
-MISC ChangeLog 2728 RMD160 7b9c9f365fd43580e63e3de3ecebdba183fa6b90 SHA1 2533257d44f5e70a5e108182fc1f0d884ef03c64 SHA256 8cf6dcd2437c5de0427f9b0098351dcf1d28162dafbc5033c4e1bb9b499697f6
+EBUILD isight-firmware-tools-1.5.90-r1.ebuild 2012 RMD160 39de7b4b155884d63185ecdcc9ce0aafcf87023d SHA1 3102a43a77f3e335da3fad4543ad88073f1dd318 SHA256 ed2121645c16e7f85a638bed86d4eab2070e03c32b40bdb6aabc393e025d7787
+EBUILD isight-firmware-tools-1.5.90.ebuild 1778 RMD160 4aa445e2b2a6e2d6cac2a69db67388698b020e36 SHA1 2101ac84713b5dcb2fca36433b32f993ca500048 SHA256 d5c46b8edb07ee7f6ffe1faf15e635f9b70e206b8cf0ca3a36f9516c65d7bd97
+MISC ChangeLog 3234 RMD160 14a96fa850f34d6bd0bee345483d5b5ca8781c4c SHA1 cb781429c17adbb0447fffd9c12cd387468d6e08 SHA256 bd7af77e91e07462e8f2d855b80c8efc9b05a00e6120115a906c31294cc26891
 MISC metadata.xml 280 RMD160 e6e2ba5d4a79b5fdf0edd7141b148049770f8e97 SHA1 cd693373bb3d28481fd9d5511d987656b94c9772 SHA256 b8c5566fa0cf8c90ad766b9e5c10c2e8191d1341efc7aac171117073a74c7cb8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuFpjUACgkQ1fmVwcYIWAZ8HgCfVDcdYnTHLL0OP2cMvPl4xJU7
-9wYAoMSR4sq0X/E8PHtGJEeWLS4ZQIGo
-=eAc3
+iEYEARECAAYFAkvh7BAACgkQ1fmVwcYIWAY7uACdHsHJS0vJmVXnr/XF34h48jI3
+zpEAoMzxgNSP6HwQZ4pMIcW/Xol5FpQt
+=EZpz
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 496c4c6bc642..000000000000
--- a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.2-ift-ldadd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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
deleted file mode 100644
index cc7ad436db63..000000000000
--- a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.2-rules.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/files/isight-firmware-tools-1.4.2-hal-disable.patch b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.4.2-hal-disable.patch
deleted file mode 100644
index 8ab87d3647cc..000000000000
--- a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.4.2-hal-disable.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 7a2d0d63c3b6e0e394ab70dae9d6fb70eceb544d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 28 Jun 2009 21:31:46 +0200
-Subject: [PATCH] Simplify udev/hal (des)activation
-
-	* Only check for HAL if we actually want to build its support.
-	* Really on autoconf defined variables/behavior.
----
- configure.ac |   56 ++++++++++++++++++++------------------------------------
- 1 files changed, 20 insertions(+), 36 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2eb7e86..dbd560f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,35 +23,29 @@ PKG_CHECK_MODULES(LOAD, [libusb])
- AC_SUBST(LOAD_CFLAGS)
- AC_SUBST(LOAD_LIBS)
- 
--PKG_CHECK_MODULES(HAL, [hal])
--AC_SUBST(HAL_CFLAGS)
--AC_SUBST(HAL_LIBS)
--
- dnl whether to provide udev rules and loader
- AC_ARG_ENABLE(udev,
--	     [AC_HELP_STRING([--disable-udev],[Disable udev firmware loader])],
--	     [if test $enableval = "yes" ; then
--	     	 SUPPORT_UDEV=1
--	      else
--		SUPPORT_UDEV=0
--	      fi],
--	      [SUPPORT_UDEV=1])
--AM_CONDITIONAL(SUPPORT_UDEV, [test ${SUPPORT_UDEV} = 1])
--if test ${SUPPORT_UDEV} = 1 ; then
-+	AS_HELP_STRING([--disable-udev],[Disable udev firmware loader])],
-+	, [enable_udev=yes])
-+
-+AM_CONDITIONAL(SUPPORT_UDEV, [test $enable_udev = yes])
-+if test $enable_udev = yes ; then
-    udevdir=${libdir}/udev
-    AC_SUBST(udevdir)
- fi
- 
- dnl whether to provide hal callout
- AC_ARG_ENABLE(hal,
--	     [AC_HELP_STRING([--enable-hal],[Enable HAL callout])],
--	     [if test $enableval = "yes" ; then
--	     	 SUPPORT_HAL=1
--	      else
--		SUPPORT_HAL=0
--	      fi],
--	      [SUPPORT_HAL=0])
--AM_CONDITIONAL(SUPPORT_HAL, [test ${SUPPORT_HAL} = 1])
-+	[AS_HELP_STRING([--enable-hal],[Enable HAL callout])],
-+	, [enable_hal=no])
-+
-+if test $enable_hal = yes; then
-+	PKG_CHECK_MODULES(HAL, [hal])
-+	AC_SUBST(HAL_CFLAGS)
-+	AC_SUBST(HAL_LIBS)
-+fi
-+
-+AM_CONDITIONAL(SUPPORT_HAL, [test $enable_hal = yes])
- 
- dnl GETTEXT
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
-@@ -64,24 +58,14 @@ AM_GLIB_GNU_GETTEXT
- 
- IT_PROG_INTLTOOL([0.35])
- 
--
--dnl OUTPUT
- AC_OUTPUT
- 
--
--yes_no () {
--    if test $1 = 0 ; then
--	echo "no";
--    else
--	echo "yes"
--    fi
--}
--
- echo
--echo "HAL callout :		" $(yes_no $SUPPORT_HAL)
--echo "udev rules :		" $(yes_no $SUPPORT_UDEV)
-+echo "HAL callout :		" $enable_hal
-+echo "udev rules :		" $enable_udev
- echo
--if test $SUPPORT_UDEV = 1 -a $SUPPORT_HAL = 1 ; then
-+
-+if test $enable_udev = yes -a $enable_hal = yes ; then
-    echo `tput smso` "/!\ WARNING: avoid installing both UDEV rules and HAL callout!" `tput rmso`;
-    echo
--fi
-\ No newline at end of file
-+fi
--- 
-1.6.3.3
-
diff --git a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch
new file mode 100644
index 000000000000..4f508d7312f2
--- /dev/null
+++ b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch
@@ -0,0 +1,36 @@
+diff -ru isight-firmware-tools-1.5.90/src/export.c isight-firmware-tools-1.5.90/src/export.c
+--- isight-firmware-tools-1.5.90/src/export.c	2008-03-24 17:52:16.000000000 +0100
++++ isight-firmware-tools-1.5.90/src/export.c	2010-02-26 12:40:07.000000000 +0100
+@@ -35,6 +35,8 @@
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+ 
++#include <locale.h>
++
+ /* OPTIONS */
+ static gchar *input	= NULL;
+ static gchar *output	= "isight.ihx";
+diff -ru isight-firmware-tools-1.5.90/src/extract.c isight-firmware-tools-1.5.90/src/extract.c
+--- isight-firmware-tools-1.5.90/src/extract.c	2009-08-13 18:50:54.000000000 +0200
++++ isight-firmware-tools-1.5.90/src/extract.c	2010-02-26 12:39:42.000000000 +0100
+@@ -36,6 +36,8 @@
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+ 
++#include <locale.h>
++
+ /*
+  * Foreach file identified by their sha1sum, we store the offset where
+  * the firmware begin in the file.
+Only in isight-firmware-tools-1.5.90/src: isight.rules.in
+diff -ru isight-firmware-tools-1.5.90/src/load.h isight-firmware-tools-1.5.90/src/load.h
+--- isight-firmware-tools-1.5.90/src/load.h	2009-06-18 19:31:45.000000000 +0200
++++ isight-firmware-tools-1.5.90/src/load.h	2010-02-26 12:40:41.000000000 +0100
+@@ -36,6 +36,8 @@
+ #include <glib.h>
+ #include <usb.h>
+ 
++#include <locale.h>
++
+ #ifndef _LOAD_H_
+ #define	_LOAD_H_
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.4.2.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.5.90-r1.ebuild
index 32aa794fac11..b7a09f187cbe 100644
--- a/media-video/isight-firmware-tools/isight-firmware-tools-1.4.2.ebuild
+++ b/media-video/isight-firmware-tools/isight-firmware-tools-1.5.90-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.4.2.ebuild,v 1.1 2009/06/28 21:18:41 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-1.5.90-r1.ebuild,v 1.1 2010/05/05 22:07:00 eva Exp $
 
 EAPI="2"
-WANT_AUTOMAKE="1.10"
 
-inherit autotools eutils multilib versionator
+inherit eutils multilib versionator
 
-MY_MAJORV=$(get_version_component_range 1-2)
+MY_MAJORV="$(get_version_component_range 1).6"
 DESCRIPTION="Extract, load or export firmware for the iSight webcams"
 HOMEPAGE="http://bersace03.free.fr/ift/"
 SRC_URI="http://launchpad.net/${PN}/main/${MY_MAJORV}/+download/${P}.tar.gz"
@@ -19,34 +18,37 @@ IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.14
 	virtual/libusb:0
-	dev-libs/libgcrypt"
+	dev-libs/libgcrypt
+	>=sys-fs/udev-149"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.5
 	sys-apps/texinfo"
 
 src_prepare() {
-	# Fix forced as-needed build, bug #247904
-	epatch "${FILESDIR}/${PN}-1.2-ift-ldadd.patch"
-
-	# Fix build without hal, bug #259015
-	epatch "${FILESDIR}/${PN}-1.4.2-hal-disable.patch"
+	# Fix rules for recent udev versions, bug #316027
+	sed 's/SYSFS/ATTR/g' -i src/isight.rules.in.in || die "sed 1 failed"
 
+	# Fix multilib support
 	sed "s:/lib/firmware:/$(get_libdir)/firmware:" \
-		-i src/isight.rules.in.in || die "sed failed"
+		-i src/isight.rules.in.in || die "sed 2 failed"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed 3 failed"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	# Fix build with -O0, bug #221325
+	epatch "${FILESDIR}/${PN}-1.5.90-build-O0.patch"
 }
 
 src_configure() {
 	# https://bugs.launchpad.net/isight-firmware-tools/+bug/243255
-	econf --enable-udev --disable-hal --docdir="${ROOT}/usr/share/doc/${P}"
+	econf --docdir="${ROOT}/usr/share/doc/${PF}"
 }
 
 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"
+	rm -f "${D}/usr/share/doc/${PF}/HOWTO"
 	dodoc AUTHORS ChangeLog HOWTO NEWS README || die "dodoc failed"
 }
 
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.5.90.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.5.90.ebuild
index 4e31a0612577..2409c288a6b0 100644
--- a/media-video/isight-firmware-tools/isight-firmware-tools-1.5.90.ebuild
+++ b/media-video/isight-firmware-tools/isight-firmware-tools-1.5.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 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.5.90.ebuild,v 1.1 2010/02/24 22:20:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-1.5.90.ebuild,v 1.2 2010/05/05 22:07:00 eva Exp $
 
 EAPI="2"
 
-inherit autotools eutils multilib versionator
+inherit eutils multilib versionator
 
 MY_MAJORV="$(get_version_component_range 1).6"
 DESCRIPTION="Extract, load or export firmware for the iSight webcams"