--- irda-utils-0.9.18-r4.ebuild.orig	2010-11-02 23:08:31.000000000 +0100
+++ irda-utils-0.9.18-r4.ebuild	2010-11-02 23:10:37.000000000 +0100
@@ -14,7 +14,7 @@
 IUSE=""
 
 RDEPEND="=dev-libs/glib-2*
-	>=sys-apps/pciutils-2.2.7-r1
+	sys-apps/pciutils
 	sys-process/procps
 	sys-apps/setserial
 	sys-apps/grep
@@ -25,31 +25,32 @@
 
 src_unpack() {
 	unpack ${A}
-
 	cd "${S}"
+
 	epatch "${FILESDIR}"/irda-utils-rh1.patch \
 		"${FILESDIR}"/${P}-makefile.diff \
 		"${FILESDIR}"/${P}-smcinit.diff \
 		"${FILESDIR}"/${P}-io.h.diff \
 		"${FILESDIR}"/${P}-dofail.patch \
 		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-bitsperlong-317539.patch
 
 	# fix crosscompile, respect CFLAGS (Bug 200295)
 	sed -i -e "/^CC/s:gcc:$(tc-getCC):" \
 		-e "/^LD/s:ld:$(tc-getLD):" \
 		-e "/^AR/s:ar:$(tc-getAR):" \
 		-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile
+		-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile || die
 
 	# fix compile when pciutils is compiled with USE=zlib (Bug 200295)
-	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile
+	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile || die
 
 	# disable etc subdir in Makefile
-	sed -i -e "s:^\(DIRS.*=.* \)etc \(.*\):\1\2:g" Makefile
+	sed -i -e "s:^\(DIRS.*=.* \)etc \(.*\):\1\2:g" Makefile || die
 
 	# disable write_pid(), because we don't need it
-	sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c
+	sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c || die
 
 	append-flags "-fno-strict-aliasing"
 }
@@ -66,31 +67,31 @@
 	emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \
 		MANDIR="${D}usr/share/man"	|| die "emake install failed"
 
-	newdoc ethereal/README     README.wireshark
-	newdoc irattach/README     README.irattach
-	newdoc irdadump/README     README.irdadump
-	newdoc irdaping/README     README.irdaping
-	newdoc irsockets/README    README.irsockets
-	newdoc tekram/README       README.tekram
-	newdoc smcinit/README      README.smcinit
-	newdoc smcinit/README.Peri README.smcinit.Peri
-	newdoc smcinit/README.Rob  README.smcinit.Rob
-	newdoc smcinit/README.Tom  README.smcinit.Tom
-	newdoc irattach/ChangeLog  ChangeLog.irattach
-	newdoc irdadump/ChangeLog  ChangeLog.irdadump
-	newdoc smcinit/ChangeLog   ChangeLog.smcinit
-	dohtml smcinit/RobMiller-irda.html
-	dodoc README
+	newdoc ethereal/README README.wireshark || die
+	newdoc irattach/README README.irattach || die
+	newdoc irdadump/README README.irdadump || die
+	newdoc irdaping/README README.irdaping || die
+	newdoc irsockets/README README.irsockets || die
+	newdoc tekram/README README.tekram || die
+	newdoc smcinit/README README.smcinit || die
+	newdoc smcinit/README.Peri README.smcinit.Peri || die
+	newdoc smcinit/README.Rob README.smcinit.Rob || die
+	newdoc smcinit/README.Tom README.smcinit.Tom || die
+	newdoc irattach/ChangeLog ChangeLog.irattach || die
+	newdoc irdadump/ChangeLog ChangeLog.irdadump || die
+	newdoc smcinit/ChangeLog ChangeLog.smcinit || die
+	dohtml smcinit/RobMiller-irda.html || die
+	dodoc README || die
 
-	newconfd "${FILESDIR}/irda.confd" irda
-	newinitd "${FILESDIR}/irda.initd" irda
+	newconfd "${FILESDIR}/irda.confd" irda || die
+	newinitd "${FILESDIR}/irda.initd" irda || die
 
 	insinto /etc/modprobe.d
-	newins "${FILESDIR}/irda.modsd" irda.conf
+	newins "${FILESDIR}/irda.modsd" irda.conf || die
 
 	insinto /etc/udev/rules.d
-	newins "${FILESDIR}/irda.rules" 53-irda.rules
+	newins "${FILESDIR}/irda.rules" 53-irda.rules || die
 	exeinto /lib/udev
-	newexe "${FILESDIR}/irda-setup.sh" irda-setup
-	newexe "${FILESDIR}/irda-usb.sh" irda-usb
+	newexe "${FILESDIR}/irda-setup.sh" irda-setup || die
+	newexe "${FILESDIR}/irda-usb.sh" irda-usb || die
 }