Patch rediffed as per feedback by Samuli Suominen.

Package-Manager: portage-2.1.9.19/cvs/Linux x86_64

3 files changed, 22 insertions, 19 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index 9d268669dc41..e7c429da4ca5 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/irda-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.37 2010/10/17 13:39:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.38 2010/10/17 13:57:56 chainsaw Exp $
+
+  17 Oct 2010; <chainsaw@gentoo.org> files/irda-utils-0.9.18-ldflags.patch:
+  Patch rediffed as per feedback by Samuli Suominen.
 
 *irda-utils-0.9.18-r4 (17 Oct 2010)
 
diff --git a/net-wireless/irda-utils/Manifest b/net-wireless/irda-utils/Manifest
index 2c28bc81da7c..fff1ddf80dc0 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -6,7 +6,7 @@ AUX irda-usb.sh 1287 RMD160 3296f936476b79819c3d98b57b31518545a394ed SHA1 3e5018
 AUX irda-utils-0.9.18-asneeded.patch 415 RMD160 5f0bba27e531149208de76d69f771e8d30b07745 SHA1 0ce5d0bd9f7ce655262f1f2bc27a9d2756f2fa12 SHA256 28ba1a4d0c5cffde05dc82d9fc55a8366756dfd1f35686cffd133a184e5d8025
 AUX irda-utils-0.9.18-dofail.patch 770 RMD160 2ce3f073b2fe7edc6e1e3167f3863a25cd092ae4 SHA1 45f5db713f7fad1b3ad5489e4462e0cbe333c2f8 SHA256 206deac43962b8240a1d1b898aac91418204c5deec8bd2a11c778bed01926b75
 AUX irda-utils-0.9.18-io.h.diff 1604 RMD160 51a71ec4a5388cceb76aeeb24709a39f62e2cb91 SHA1 416b0229a2cc53ef2f030eba1089aac6dd786fec SHA256 41ad319946969d3ef3951894433420203666924d97c50acf571f89bd79adde99
-AUX irda-utils-0.9.18-ldflags.patch 4537 RMD160 4fb6a711e590ee496351831f8213d037bf07fdd8 SHA1 07504c7d0e47fe77385889927dd866d2e571786a SHA256 97057e86e26c938ded7c326a907e6ab0be3a6a54363dff9e979d3aa0c983faee
+AUX irda-utils-0.9.18-ldflags.patch 4537 RMD160 e36f637c5ac544818cf89d6e1ec5f082a6782284 SHA1 9c8a3cf66403d5cf480becbea0d8fc46b348fed6 SHA256 d89aafeaa0d7e19d0c8b9d35136ec298a864463d1ea0ca2a84d410727e57b3a2
 AUX irda-utils-0.9.18-makefile.diff 298 RMD160 daa1b92b0e1db4afd844944dcf6574e677382a07 SHA1 3fe858ead185931a73db6c37f70e98f3061c4b40 SHA256 1ed15399f8b1b8bb92b0c7b7e263030382a8b9b743bcfcaf86e5babdb31c0174
 AUX irda-utils-0.9.18-smcinit.diff 509 RMD160 d5887378dd3e5c051889b67d82e5c998f1132dfe SHA1 90f2ed5ec73c678fcc35f3c6540a7e3959e8d606 SHA256 fb1ee401db2630d24ca263c7f1612db723e6c836616a336d2c5a463130355b68
 AUX irda-utils-rh1.patch 444 RMD160 97a24330f9b3c639f9d53ad25008d07b59391af6 SHA1 7fbbb6438b1057eaad65597dff29a1727d09573e SHA256 725cd43b05dfc9f05f49ee8d3a81050d3421639c8440092c4d9bed5de1c31b30
@@ -17,12 +17,12 @@ AUX irda.rules 683 RMD160 df3346e3b5daaa5cc4722f226afbc4d4ee359842 SHA1 16a67ccf
 DIST irda-utils-0.9.18.tar.gz 168390 RMD160 440e5b1e013a639431bc247f0005699edabd3607 SHA1 00cd918e373a1f7735dbf8af3a29ade4564ff763 SHA256 61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6
 EBUILD irda-utils-0.9.18-r3.ebuild 2824 RMD160 8695b3246e7935fc7de17be9869c2c5131d559a7 SHA1 7b782edcfea73d940f2ab642a9a295125f36f7ad SHA256 f14930ddeb9912b99a7cd3abec519456e59cf5679b55525ba485ec903c675906
 EBUILD irda-utils-0.9.18-r4.ebuild 2863 RMD160 8759e589500081b9b8350ba9256596855f9e7a77 SHA1 6e128d786bf5a9ccf30dd4a6a7cfcd1a43b8324c SHA256 ee59cbebb212cd7936407883e810a3e61e67088a86702adbe96f47d040560955
-MISC ChangeLog 7954 RMD160 bf0498008a5ee4c180dcca3d4829c42435bc4182 SHA1 ddf3f25b2b5bc582f25a0caee689bde97694408d SHA256 b97e7ee0e5ba537a92b4e7c20c8ac0836715ec19e3987533bc1f8f71857b748f
+MISC ChangeLog 8084 RMD160 5b87c31cd8e7b35101c25637a45f6d3370f9e2f2 SHA1 dfefca57b3c69efae52ace30cc282b3ffe80dcd7 SHA256 92971958e37deb3bd8028c16de8b229713167c2df80e27a343b571c92ed48c2c
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky6/LcACgkQp5vW4rUFj5oewQCgs5RsS8daJzc+ru0+UqHn+sgu
-5KIAoL4uaQtPtfil+GmCAk1sZ91tK2yb
-=JJ70
+iEYEARECAAYFAky7APkACgkQp5vW4rUFj5qdkgCeOKfdFHdRUa7Peh70HPH6jQ/y
+LvAAnjVnosF2vVAC5uNiPCbtulUI8/H2
+=UMDo
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-ldflags.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-ldflags.patch
index a194c31cfedb..d8548ed79ff0 100644
--- a/net-wireless/irda-utils/files/irda-utils-0.9.18-ldflags.patch
+++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-ldflags.patch
@@ -6,7 +6,7 @@ diff -uNr irda-utils-0.9.18.ORIG/findchip/Makefile irda-utils-0.9.18/findchip/Ma
  findchip: $(OBJS)
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(OBJS) $(CFLAGS) -o $@
-+	$(ECMD)$(CC) $(OBJS) $(CFLAGS) -o $@ $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(OBJS) $(CFLAGS) -o $@
  
  
  clean:
@@ -15,7 +15,7 @@ diff -uNr irda-utils-0.9.18.ORIG/findchip/Makefile irda-utils-0.9.18/findchip/Ma
  gfindchip: gfindchip.c 
  	$(prn_cc)
 -	$(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags`  $< -o $@ `gtk-config --libs`
-+	$(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags`  $< -o $@ `gtk-config --libs` $(LDFLAGS)
++	$(ECMD))$(CC) $(LDFLAGS) $(CFLAGS) `gtk-config --cflags`  $< -o $@ `gtk-config --libs`
  
 diff -uNr irda-utils-0.9.18.ORIG/irattach/Makefile irda-utils-0.9.18/irattach/Makefile
 --- irda-utils-0.9.18.ORIG/irattach/Makefile	2010-10-17 14:30:57.000000000 +0100
@@ -25,14 +25,14 @@ diff -uNr irda-utils-0.9.18.ORIG/irattach/Makefile irda-utils-0.9.18/irattach/Ma
  irattach: irattach.o util.o
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
-+	$(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@ $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(CFLAGS) irattach.o util.o -o $@
  
  
  
  dongle_attach: dongle_attach.o
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
-+	$(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@ $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(CFLAGS) dongle_attach.o -o $@
  
  
  install: $(TARGETS)
@@ -44,7 +44,7 @@ diff -uNr irda-utils-0.9.18.ORIG/irdadump/Makefile irda-utils-0.9.18/irdadump/Ma
  irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(CFLAGS) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) `pkg-config --libs glib-2.0`
-+	$(ECMD)$(CC) $(CFLAGS) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) `pkg-config --libs glib-2.0` $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(CFLAGS) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) `pkg-config --libs glib-2.0`
  
  
  .c.o:
@@ -56,7 +56,7 @@ diff -uNr irda-utils-0.9.18.ORIG/irdaping/Makefile irda-utils-0.9.18/irdaping/Ma
  irdaping: $(OBJS)
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
-+	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) -o $@
  
  
  .c.o:
@@ -68,7 +68,7 @@ diff -uNr irda-utils-0.9.18.ORIG/irnetd/Makefile irda-utils-0.9.18/irnetd/Makefi
  irnetd: $(OBJS)
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
-+	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) -o $@
  
  
  install: irnetd
@@ -80,7 +80,7 @@ diff -uNr irda-utils-0.9.18.ORIG/irsockets/Makefile irda-utils-0.9.18/irsockets/
  %: %.o
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS)
-+	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS)
  
  
  %.o: %.c
@@ -93,7 +93,7 @@ diff -uNr irda-utils-0.9.18.ORIG/psion/Makefile irda-utils-0.9.18/psion/Makefile
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
 \ No newline at end of file
-+	$(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(CFLAGS) $(PSION_SRC) -o $@
 diff -uNr irda-utils-0.9.18.ORIG/smcinit/Makefile irda-utils-0.9.18/smcinit/Makefile
 --- irda-utils-0.9.18.ORIG/smcinit/Makefile	2010-10-17 14:30:57.000000000 +0100
 +++ irda-utils-0.9.18/smcinit/Makefile	2010-10-17 14:31:21.000000000 +0100
@@ -102,19 +102,19 @@ diff -uNr irda-utils-0.9.18.ORIG/smcinit/Makefile irda-utils-0.9.18/smcinit/Make
  smcinit: smcinit.o
  	$(prn_cc_o)
 -	$(ECMD)$(CC) -o $@ $^ $(LIBS) -lpci
-+	$(ECMD)$(CC) -o $@ $^ $(LIBS) -lpci $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -lpci
  
  
  tosh1800-smcinit: tosh1800-smcinit.o
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci
-+	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci
  
  
  tosh2450-smcinit: tosh2450-smcinit.o
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci
-+	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci
  
  
  %o: %c
@@ -126,7 +126,7 @@ diff -uNr irda-utils-0.9.18.ORIG/tekram/Makefile irda-utils-0.9.18/tekram/Makefi
  irkbd: $(OBJS)
  	$(prn_cc_o)
 -	$(ECMD)$(CC) $(OBJS) -o $@
-+	$(ECMD)$(CC) $(OBJS) -o $@ $(LDFLAGS)
++	$(ECMD)$(CC) $(LDFLAGS) $(OBJS) -o $@
  
  
  .c.o: