Fix headers used for compile (#317539 by Christophe LEFEBVRE)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 34 insertions, 18 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index 949a48789cbc..6b38964e030e 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/irda-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.43 2013/02/10 15:23:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.44 2013/10/13 16:36:13 pacho Exp $
+
+  13 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/irda-utils-0.9.18-headers.patch, irda-utils-0.9.18-r4.ebuild:
+  Fix headers used for compile (#317539 by Christophe LEFEBVRE)
 
   10 Feb 2013; Mike Gilbert <floppym@gentoo.org> irda-utils-0.9.18-r3.ebuild,
   irda-utils-0.9.18-r4.ebuild:
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch
new file mode 100644
index 000000000000..1c40edc7cd7e
--- /dev/null
+++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch
@@ -0,0 +1,11 @@
+--- tekram/Makefile.orig	2010-11-02 22:41:43.000000000 +0100
++++ tekram/Makefile	2010-11-02 22:41:53.000000000 +0100
+@@ -38,7 +38,7 @@
+ #
+ # System stuff
+ #
+-SYS_INCLUDES = -I/usr/src/linux/include -I/usr/include -I../include
++SYS_INCLUDES = -I/usr/include -I../include
+ SYS_LIBRARIES = 
+ SYS_LIBPATH = -L/usr/lib -L/usr/local/lib 
+ 
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
index 934eb2aca569..eed628a4c28b 100644
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild,v 1.5 2013/02/10 15:23:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild,v 1.6 2013/10/13 16:36:13 pacho Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs flag-o-matic udev
 
 DESCRIPTION="IrDA management and handling utilities"
@@ -13,50 +14,50 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
 IUSE=""
 
-RDEPEND="=dev-libs/glib-2*
+RDEPEND="
+	dev-libs/glib:2
 	>=sys-apps/pciutils-2.2.7-r1
 	sys-process/procps
 	sys-apps/setserial
 	sys-apps/grep
-	virtual/udev"
+	virtual/udev
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	!app-laptop/smcinit"
+	!app-laptop/smcinit
+"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	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}-headers.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"
+	append-flags "-fno-strict-aliasing" # bug????
 }
 
 src_compile() {
-	emake RPM_OPT_FLAGS="${CFLAGS}" RPM_BUILD_ROOT="${D}" ROOT="${D}" \
-		|| die "emake failed"
+	emake RPM_OPT_FLAGS="${CFLAGS}" RPM_BUILD_ROOT="${D}" ROOT="${D}"
 }
 
 src_install () {
@@ -64,7 +65,7 @@ src_install () {
 	dodir /usr/sbin
 
 	emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \
-		MANDIR="${D}usr/share/man"	|| die "emake install failed"
+		MANDIR="${D}usr/share/man"
 
 	newdoc ethereal/README     README.wireshark
 	newdoc irattach/README     README.irattach