Clean up patch.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index af95110e6ef7c1317d841c68356d4b416a8d6fb4..287f227376e099fc18915467beddb124f7f7f762 100644 (file)
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libnids
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.44 2012/01/07 18:27:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.45 2012/01/07 18:33:47 jer Exp $
+
+  07 Jan 2012; Jeroen Roovers <jer@gentoo.org> files/libnids-1.18-elif.patch:
+  Clean up patch.
 
   07 Jan 2012; Jeroen Roovers <jer@gentoo.org> libnids-1.18-r1.ebuild,
   +files/libnids-1.18-elif.patch, libnids-1.24-r1.ebuild:

diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index dbdb9f2cd9a66c01d46e9af9e253c46d5a930b8d..ca6ab1fb732e155091657112a72e32691600ec4e 100644 (file)
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX libnids-1.18-chksum.c-ebx.patch 615 RMD160 53ba9fe99c2175ff64277f485887d68a4695d1c2 SHA1 5dbf69478187792dc824366cf29ae74846c95a78 SHA256 7d092dfa010001e5935c1f1104a34cec061f813664501566a504b942d2232c78
-AUX libnids-1.18-elif.patch 230 RMD160 a7ec3357d13245bc54c8d2e1cd16d1630020856e SHA1 d33dc9026533d975a1799e1b422eabe10583026c SHA256 77bf2c870f012111c894ce7749f4fb5082484b196daa49b20c87fb019124480d
+AUX libnids-1.18-elif.patch 230 RMD160 35d64d72225233e94a218be8f1c82c4c3ee73cd7 SHA1 294a21c4d07c08fd62b8b98134f0de81f895ebed SHA256 ed356a9e5dcff5300405d9bd1d17ddcdae27a4615eb2f81a8b6af49d304599ee
 AUX libnids-1.24-ldflags.patch 494 RMD160 d838d04e2ab8021eabfc7560315e71a48cec13e5 SHA1 ecdeec72628a325c9c838751e0d33f4ef312182b SHA256 e1d61d854398cd23570fb81cba078449d6c74a61644a3451b3f9c19d37c68ef9
 DIST libnids-1.18.tar.gz 114013 RMD160 b33ba8237ba0bb31d2515bd5b7552449cfcca8f3 SHA1 3494e614e5e5d2f60f2ffe738307e60e77e04a81 SHA256 b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd
 DIST libnids-1.24.tar.gz 151021 RMD160 66a1a332a70b316fd83905887dc731b5bf28d715 SHA1 9a421df05cefdc4f5f7db95efc001b3c2b5249ce SHA256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359
@@ -10,12 +10,12 @@ EBUILD libnids-1.18-r1.ebuild 952 RMD160 08d27b97e12d8eff6deadc92fd5138a08586c43
 EBUILD libnids-1.18.ebuild 924 RMD160 598b3f1bdf06f3141b22a22fc4266eba2e4566fc SHA1 877996426d4d7f81ebe9d6a375246bbfb2f7ba0e SHA256 ade236a62537e98377ec2d83bcfe833db7089cb09acd0ab5cd3393874d729482
 EBUILD libnids-1.24-r1.ebuild 1038 RMD160 68701f474b43e99d1c8afd2bb0d6b76cdd449bdf SHA1 0b06a36e343c4c9cc941bcdd3f1df9734ef24158 SHA256 b8b5a14203a0be03b0b48f9a0ff483ec7dcaddbe256ab92a8b37b1dc995a484f
 EBUILD libnids-1.24.ebuild 908 RMD160 baa92d3b240e1830bbd4aa8cd671f60dc63d903c SHA1 c07e5c2841ddf7190ad93fe02e10344580561b0e SHA256 8efa40e07fdc808ac97ff56cb8b0dd04f4b90eaef3dfa70bbf03edf7f94a395b
-MISC ChangeLog 6746 RMD160 cdf28e1cc506a00bc8a4c90af022d54dbb435791 SHA1 c3888fa7c446d88ea6a08297f73a54671b020443 SHA256 3d79c4446083cb4e38fda5d2abfc97648944cb8232a5743ac1d11fe57684cecd
+MISC ChangeLog 6843 RMD160 f647307adb00cd30c8db3555e8593ea78ee92cd2 SHA1 4486b9c62fc3444c21046631d508776ca6cf7b34 SHA256 b085ed67c188427c2b849dae8cb7b9a81f1a27237fc44c7cdb5b8b610f6c2288
 MISC metadata.xml 483 RMD160 2735c54f423a6bdd2d47536a7d22eec3b2717e2f SHA1 3012df70c36825300e4e78c707ccd4414b53db7d SHA256 fea8cd5f14b2ecdcb26227be10d73862452542ea2ac9e41738c8dd1a1a093015
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8IjpYACgkQVWmRsqeSphPC0wCdEE4pwrJzcRdAVsDytIOrKQ6R
-0yQAn2VonqvC5QmMbPRcRpT4S6eEf7oK
-=WdXv
+iEYEARECAAYFAk8IkBEACgkQVWmRsqeSphNwlACfbALrWp15KAFHldaZHZYNSNRK
+skMAnRln66corvtmSU9GFhWFJp3ViCWy
+=p7uG
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libnids/files/libnids-1.18-elif.patch b/net-libs/libnids/files/libnids-1.18-elif.patch
index cabb883569e34960c6911f35d6fb82d5da88054f..106ffdc14c8ad8a10c42fafedae008efc1e40898 100644 (file)
--- a/net-libs/libnids/files/libnids-1.18-elif.patch
+++ b/net-libs/libnids/files/libnids-1.18-elif.patch
@@ -1,5 +1,5 @@
---- src/killtcp.c.org  2002-08-21 18:19:40.000000000 +0200
-+++ src/killtcp.c      2012-01-07 19:15:45.451020838 +0100
+--- a/src/killtcp.c    2002-08-21 18:19:40.000000000 +0200
++++ b/src/killtcp.c    2012-01-07 19:15:45.451020838 +0100
 @@ -100,6 +100,6 @@
      if (initialized)
        abort();