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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 41 insertions, 25 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/Manifest b/net-wireless/irda-utils/Manifest
index 2eeaf460670a..9845b899c533 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -5,6 +5,7 @@ AUX irda-setup.sh 1638 SHA256 378deb51b9a6321013b57d243ff7b8301078dc7fde2959820b
 AUX irda-usb.sh 1287 SHA256 3a7189528975249d1701e833f68f301d011150b3b7c0ff1e795bbffc0cf5fecf SHA512 f8fadaed51f72e13d6693aabc273408bb4d602972d04ce2c0eb71f68e626a6beea2534476aeaedc126970099701922ad38322117e66859be2d5f916ae7015936 WHIRLPOOL ffcaea22c2a254afa3ded6a33c2e96527e3daeea73b60ef10ac5482db1c5e258c8f774232d8747acab05cdbdb82a902c08412780adea419f0fd592d5389c0fb0
 AUX irda-utils-0.9.18-asneeded.patch 415 SHA256 28ba1a4d0c5cffde05dc82d9fc55a8366756dfd1f35686cffd133a184e5d8025 SHA512 13ff6c766e9c4791b1d380d510c6feb90839897e08ed4381c05da92bf14c3ea4c2806929181c6bf904be2acc2f03cababf5cef41bce17e4e5525c75f97fe445e WHIRLPOOL 5cb7f98f37607c7753f26797ff1b78e66bfd8876b1cf8ded217c2243b0e76e700c081d4647a9e1996464c81b1a5be5d5341a53e38bc9f919af73a03df3445b2d
 AUX irda-utils-0.9.18-dofail.patch 770 SHA256 206deac43962b8240a1d1b898aac91418204c5deec8bd2a11c778bed01926b75 SHA512 f332bf54b8ddae349c6695e9e7f970e38a0a6afcf57e2aa8eac29e0e0fb00cb8c8e5d9c40002ccaa97cea6f67c7fe2ac392e68dc8aeeaa657f962c41dd8c4b33 WHIRLPOOL 952e5cfa38611c52567673721d70b9ff9be20ce2c81de48108857179aae80d450ce54d215f25e3bd13a3a2c9b501e03725ccaa31d2317a150153d84fef6d163f
+AUX irda-utils-0.9.18-headers.patch 334 SHA256 39f16edb05bd07c247910799c766e168fa3b545e71d7bd698a0a8507433fd880 SHA512 4451449481779d23b4d51f9dda60c1bbda81becccae0f06b915b4ae95e35774807e0210cf80fc22390736f6d6de920a8f278237fae56e76773ef9ae8d82eed3f WHIRLPOOL 69e9999cfc54e3149612603a1b8f3652051582e4601c67dd4a5bae378334c334d8e9d95aec8a6d8d22cb6a21f6ff5cae1cb688c3900673324f861d720c335843
 AUX irda-utils-0.9.18-io.h.diff 1604 SHA256 41ad319946969d3ef3951894433420203666924d97c50acf571f89bd79adde99 SHA512 2dabf90735ca436d6214e24d14e32cf4588018dda2a7f189c49a23b9aa9c95a86277b08abb0cd4e3690238451193af6b5c5889ef1664e1e03a92d6c40db57cf6 WHIRLPOOL 5f901324c4bc67b64882e1a8040fbef9dd4303dd995dac63425a6e63f83b13f7aae91849686b43e9206b6426233884bb980d59f352e18f7cfc490125e8a41442
 AUX irda-utils-0.9.18-ldflags.patch 4537 SHA256 d89aafeaa0d7e19d0c8b9d35136ec298a864463d1ea0ca2a84d410727e57b3a2 SHA512 441a60b5d91caed0b5175a563f12cf64ab774276fec7277d7a15c63ac8063067200afdabe69c7799c2f64c82a4376471634d8d6ce62b6e514b0556106f643307 WHIRLPOOL d4ddf0c14274c5ed8e1463b0c7ef196ab77b35dc75fd395b1a00fa7e83fb83fd605a7ec8d77de847beff83b9ca306ddbd3ec25781e18b2e8ed95e5d613bf163b
 AUX irda-utils-0.9.18-makefile.diff 298 SHA256 1ed15399f8b1b8bb92b0c7b7e263030382a8b9b743bcfcaf86e5babdb31c0174 SHA512 53f95bc93f66cf65c2dedcbcab2feb7b6de789df18ab0441f3ae0395eaa061a2187672c874e5c85b77589fae11bb8d778095cb9971f0fb6569997ca5396fdf6d WHIRLPOOL 1832344850cd9b552596b5ee3e07392740394b3c921560343e6029b5c4d46a7c2de97e6ceafa7fbe672775451fa133007a62bff8aac64698b43580465ddff1a6
@@ -16,14 +17,13 @@ AUX irda.modsd 1976 SHA256 60043436833312f0756ea901cd18469015c793f208708be5fb1b9
 AUX irda.rules 683 SHA256 bdd65537e3cf460d750d595aeee06f52ca292ea6ac68e74784f8defb64dc9202 SHA512 d73aaa394447191d782661ee2a3f9333aa46838721958959d7732265a1608482a431c6b83218b68ac45ccbeafe96d95d9ec616d423f91aa6dc858f5709b0f0dd WHIRLPOOL d7514576e87cc36499a45d11a2d51b5611e7e6de1495bf190213af118f4fe8c8a71d3b5175a1e2be710f24a571b1e90c7098b6e7b670267daac903957564c976
 DIST irda-utils-0.9.18.tar.gz 168390 SHA256 61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6 SHA512 493360b5c03f93063265663b86c8ef3ade714c51edf804390c4e713cb0aeea204c5cd06c8ceffb99b1531fca7272422e53d52e03b66ddc4bceb5503f4ab5f3ad WHIRLPOOL 8282478bb9f96eb4def9f60bd7db9d6471b65bcddbb9ff6d4a63698940cc6a11062541ff2f3619d6f11928aedd172053d424698288e7a2bce9f13119078d83a6
 EBUILD irda-utils-0.9.18-r3.ebuild 2815 SHA256 164bd329738e623ee639b539bd08b1457067d2697be827a84c399258c11ff009 SHA512 20b191c2002f8a03f5f080b5bbdb5569e66ffa60a27b5d17779390714bfbf095b14ad6e72cb4a651e2157e69dd31b2f15d1a6e2b452c0d86d4e7db3c8a1bc22b WHIRLPOOL f6ab8ff8e525f75e56f7ef2eb0bd8818ea706d0535962a7485b748ca77ffee9b5df860002534d0719a74478f7a94256bd404a435d1bce53da600a683ce6cd066
-EBUILD irda-utils-0.9.18-r4.ebuild 2854 SHA256 07ad003e9f25db19cb8ecea11d486e5fdd6ad29e74d4fe451091d6669f624fb5 SHA512 d23c81f29a83bda4f323ae4da4999d45c9eb9153e0e5d6d023897d24a3fb467caffd99c751e0e2d273f7dd94cae60cbb90e004d0825a113cff827250bbe27b4f WHIRLPOOL 303010ef2a2a97886ffa45edb691612a27f7d96b275defec7572854f6e80cc72ce446e887da7d995b1921e96b79a77216ebfc1151397ca330a65d8e40e9641d8
-MISC ChangeLog 8803 SHA256 d260fb30530dbd6ebf7224e080eef8da57321e38f842572b6ea3ad200d087f51 SHA512 682c57a092ebc9ce4de3ef1cb2281c2b8c6b96d46fc68a7b7543be278e7434f9b5364319ac27304a43a49888a7cac179e32d67feb080caa501c4e752e211c8c7 WHIRLPOOL 413b427dc2883f66cbcdbbb35803f3f54066e9c136caa44652fd755e9aeead5ca40842ff9c19f7502c3ac440a6212cd6083e68054975d726fcd190c2e31a08e6
-MISC irda-utils-0.9.18-r3.ebuild.orig 2823 SHA256 00e84a877bb089c21d6e0f5e1dda90159a546f3e6071e09c44cb92e97a5a2380 SHA512 be9cdd850d66f965abb8be3a51901ff159e754f48e0a564bf4062965f717f396829e00b5bdca27502a229b91017e394580b48fa2ab85843d057124c9e151ae73 WHIRLPOOL 67e3daab69f8b3ddc581d1707d16fd81520fd09af3f266e9f2043a4db463e41798eeb3abaa322f5505ac541aab14246bd55c626b54443b1d07a4793552b7b856
+EBUILD irda-utils-0.9.18-r4.ebuild 2856 SHA256 693ae605adcb6d0760d07087a354e8df52b123a83d7335f2279cec18ef6b0414 SHA512 bcc212a2bba97600587e0b10283bbb1cf540ba15f4273988a5ca135cfa7566ace368b5794e6828e7da2d88f43d9667f88124964c8d802645972894c56e4224e1 WHIRLPOOL ef533d78a6a3f5ac2163d553e6939d23e7520a98e13585ba183de6ac6c28715b40b19b0ce6a3a05a53240d924abd00bfed588e1f86d10575b28aa45e78cb4019
+MISC ChangeLog 8983 SHA256 4c55db8b427eec7aa9275c86438bf46b9ccf26e7ca471468cc74a7db78eee158 SHA512 e0d0e441845130f369240a0229d2fca1b850a15e1977bbcc754031350b9f78e656c95a8dd8059e1233c0025284db0e85ea8f673edd4064340e5ae5c995eb67cd WHIRLPOOL 96f712775b85882cf1a368d3d07a8f7fbf1fe755e9ac4eda6589054a89966df3cf80118438075ba37e5509ebd164931fb41cfc76ff62310cee44b494b3d14ec4
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlEXu2oACgkQC77qH+pIQ6TRZQD/eaTiNtDTDyzmLsQAYV+Er+RF
-ptF/MTnRGsZkF+Xpcc0BAMg2HX+l2lCijEDtJlYYHFpyemZWi26NqvHyv0xSi+C/
-=0Amx
+iEYEAREIAAYFAlJay/4ACgkQCaWpQKGI+9T0tgCfVhQ8VixG0UK9RS+775tiNC5M
+7lsAn2yqKxORUUTtuAmrnVWwmyWGkMj7
+=JIG6
 -----END PGP SIGNATURE-----
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