fix static patch (bug #469082)

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

4 files changed, 20 insertions, 25 deletions

diff --git a/net-libs/libircclient/ChangeLog b/net-libs/libircclient/ChangeLog
index 6da642e1997e..3faac14058a1 100644
--- a/net-libs/libircclient/ChangeLog
+++ b/net-libs/libircclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libircclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/ChangeLog,v 1.14 2013/05/08 07:57:53 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/ChangeLog,v 1.15 2013/05/08 21:25:31 mr_bones_ Exp $
+
+  08 May 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  files/libircclient-1.6-include.patch, files/libircclient-1.6-static.patch:
+  fix static patch (bug #469082)
 
 *libircclient-1.6-r2 (08 May 2013)
 
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index 28d1e38e9751..78af6ca90cb1 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX libircclient-1.6-build.patch 376 SHA256 84057216f2d1efcd83e01a40762769ea616ed0aa0f6564a563799309016817a3 SHA512 1dd6a8a7c71b331ab1fc6a5d5f0c204bcc0c09362271df1f3304f78291555f3cf7c4fba278123c4d12f59793e9cf8cc867aae365aef82a51bb2b019c804b558b WHIRLPOOL cfe4975c43b3ca7984b9e4bfd888266ef3f061c14bfa27994992aafaea99ddfbb9d4fab6587ea4fa44002c02d2501090b169f704af62a94b0d3ac82cc6955153
-AUX libircclient-1.6-include.patch 455 SHA256 50e0a062e1447aee1885df6650f06d998ccb1fbe82b5906d4ec8c24c433ff23d SHA512 8b5c1e7fe32e39b684c4a7345a72b1765fe35c2e73b3d963cf344dce5163439d88001ede9bc90483aa365cd06a09034eb0989b3a7145e136b4b93552bbb07e27 WHIRLPOOL c88cf9158e57c76f88e0e27ee2c64faac4a968e572d556084bd8abc01dfabd0ebc7a9660683c4dc72ea53af195c4ec0f709eaf05de47936949e1c730b89b6596
+AUX libircclient-1.6-include.patch 289 SHA256 3378f4e8cda60ec99696915910bcbd4b61816e9870f54d7adc95fe4ade7433dd SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02 WHIRLPOOL dd12d5410a4f7d2a50d6fe16e73c2ea3f6d829be26c0899f8d0f9aab9b0ad4c9460df697e53aa6ee6acb9458720c2d74a03f6e60425ec968d43c6771708a1a20
 AUX libircclient-1.6-shared.patch 2357 SHA256 522751812c625afa24cd21daaddad250e0ce21a5f10c5fec17cf419f8a807a15 SHA512 e44c15dd4d4d1c070a0cb9451de8dedd2db43b6980c4e8b21ce10c5d54654ce1787fc8c5dc8fd2c9043a9257360aeac9d038c1aab8f7289acabb2ce1bda6b41e WHIRLPOOL bffbaa75484510e027650e1a097afe8d27b128d89dc10b728158ccdba048332e67128d40551f0751706c443d10bc54608f2fcf0f874daa3dbe596ebe1044efcf
-AUX libircclient-1.6-static.patch 448 SHA256 5505fd340880335d677e806c2fc52a9ddb85c3c573797573bb4ea65c077ac3df SHA512 6eefb4dc1cedb6c47904036f6d1c51ac66d154e74612a8f0efb9863bc367b8de2145bdfd325851496d8a87e625bc5360f4203ae426dba40cddee8c913cd9cf55 WHIRLPOOL b1cc44197293a7732894c3adcd911faa4db2f867b55e6a722f66686ac348fd9dca25888cd5c6e388b75ebaa95e520035154d761ae3001c1a31036c425bd78990
+AUX libircclient-1.6-static.patch 213 SHA256 858ebe3da96e25a3925353796f1b06d33d1859c5d795105dcca849f591e8dde1 SHA512 b370de10c348928dc75c1844b2c9f02b832ef4f44a6c7ab887e1ede35e8dbcc7fcfd427e472e35ffebc33fa98556d1cbac25be233c4ed4d5d267912c12ee9397 WHIRLPOOL a81a549fb5d32d4b28d89b50cc66d80b8df592e4b6cfe95e4a6d40e11367a1965cb33c726dbbc054603153749445591a478110a332876d7c1b864e760159e8e7
 DIST libircclient-1.6.tar.gz 392788 SHA256 6c511923023398bcd7627cf3305054befacf6874203cb0de36bdbe658779e953 SHA512 94a68f27fcb12c918fa347d4ee44747e08e016245048c81f179b9a45081bd336c329e7185a3bc46deb28c9c77e1eff5dc53de7e723b1ed5ee2c1d3cc57ce0548 WHIRLPOOL f0958c14f923b97e38d230e3d9a27aa08ef9162c0749ef0defb7b107083b27f3458dc652944672cae76527258b788045dcc040d33f055df70a5cab8e16da9ca1
 EBUILD libircclient-1.6-r1.ebuild 1177 SHA256 78804dfd8e334f22f3a4ebac55edbf6b8e187541194502f690faedd8d80d9d5b SHA512 35008456f2cc7ccb69e8bae12f7051a302451be58ff6cd9e5f6d65ce753f90b7b8085b25af940cc01b697b53a6c0f2b94541ab763044681da0115bc23f13a2a3 WHIRLPOOL f78968a45c1c589d9795fce289749895fac31dff622d4f6a53fd9acb9f832d44509842dac95cbb0dfe408e0eb4a503c1ccfafead7e4817f634c82e08ce811b44
 EBUILD libircclient-1.6-r2.ebuild 1224 SHA256 f0a56ef9b3e01d995ebd9824d2734b206debb282f101c31f99055bbb8293454a SHA512 9fa891c5f341b0fa62976f4f56f2e01ead811e363769d7cd8b696a1ec163729df36a581cbe7827fbcdc76021f56f9ce2b0507b177e7431221721223e9f486932 WHIRLPOOL 9e9c66a39dab3dffc33c18c580c8d68e80504755c9fab9d3c22e260929af95e4cf728801f7928528d6a83066672f258b4b4cd9d32e43a4ff4d41493dcbffd5cb
-MISC ChangeLog 2359 SHA256 f9cee2c74fe98730861619a28ec589524542681b1a1a159a7d4f5087dedd87c9 SHA512 b8cd55b62e24f99a359e490c6e87c61697d28685e4994a354f6d3f32fa07e5bcd629d4e2aa5f44fedb299df27f2508c7cef3f91542e32b7e95fa2e71c8d7ff0b WHIRLPOOL fb5953ee7eb91eead03ef963d370a884abcc97aa5a85f974792bc257ca36c52277d3c2e4018a788bab600337bbfd98f6740809150bbb549d1d51c9fcc7cae0d8
+MISC ChangeLog 2527 SHA256 22b7b1d032cf232b332aaec4033be7fd9c67b783c1c8dc735c853ff969005dd5 SHA512 90b2f91e7aeec08b89e94d92dce5f07f3d0ffa28b24d370d1d7d3b70cd465b9b394267f2cf4e5b2e9dc9b9fc46bc92443ae8326a815531596106f5b067a4570b WHIRLPOOL 81ca87033332f7256614efa65c19d27c747ac884fe15a342b863380c0ddb94ba8b536aa4aee24ad9927945bd6f40e15ab17e16955d4080c92078381d708f6a5b
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlGKBW4ACgkQWunnsum7y6jzPwCfXg1KdPHRiMDSsn9Yvwtzuc3d
-aLUAoJrM6YgfRxmfwk3mPPrrZiCOAv10
-=d/Dt
------END PGP SIGNATURE-----
diff --git a/net-libs/libircclient/files/libircclient-1.6-include.patch b/net-libs/libircclient/files/libircclient-1.6-include.patch
index bb9d254f8a6d..c5bce1dfd947 100644
--- a/net-libs/libircclient/files/libircclient-1.6-include.patch
+++ b/net-libs/libircclient/files/libircclient-1.6-include.patch
@@ -1,6 +1,5 @@
-diff -ru libircclient-1.6.orig/include/libircclient.h libircclient-1.6/include/libircclient.h
---- libircclient-1.6.orig/include/libircclient.h	2012-01-18 03:05:39.000000000 -0500
-+++ libircclient-1.6/include/libircclient.h	2012-04-12 13:21:48.544587401 -0400
+--- libircclient-1.6.orig/include/libircclient.h
++++ libircclient-1.6/include/libircclient.h
 @@ -130,6 +130,7 @@
  #define IN_INCLUDE_LIBIRC_H
  #include "libirc_errors.h"
diff --git a/net-libs/libircclient/files/libircclient-1.6-static.patch b/net-libs/libircclient/files/libircclient-1.6-static.patch
index e7b6016bc21f..4ecbb3362223 100644
--- a/net-libs/libircclient/files/libircclient-1.6-static.patch
+++ b/net-libs/libircclient/files/libircclient-1.6-static.patch
@@ -1,10 +1,12 @@
-diff -ru libircclient-1.6.orig/src/Makefile.in libircclient-1.6/src/Makefile.in
---- libircclient-1.6.orig/src/Makefile.in	2013-03-08 14:34:56.583873379 +0100
-+++ libircclient-1.6/src/Makefile.in	2013-03-08 14:35:27.711873000 +0100
-@@ -1,4 +1,6 @@
- # $Id: libircclient-1.6-static.patch,v 1.1 2013/05/08 07:57:53 vincent Exp $
+--- libircclient-1.6.orig/src/Makefile.in
++++ libircclient-1.6/src/Makefile.in
+@@ -9,6 +9,9 @@
+ DESTDIR=
+ APIVERSION = 1
+ 
 +prefix = @prefix@
 +exec_prefix = @exec_prefix@
- CC = @CC@
- CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
- AR=@AR@ cr
++
+ OBJS = libircclient.o
+ 
+ all:	@TARGET@