Fix bug 363511, cvs was trying to be too smart and broke the patch

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

3 files changed, 20 insertions, 25 deletions

diff --git a/app-misc/pwsafe/ChangeLog b/app-misc/pwsafe/ChangeLog
index 6f4144e77bf7..f528f2431202 100644
--- a/app-misc/pwsafe/ChangeLog
+++ b/app-misc/pwsafe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/pwsafe
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pwsafe/ChangeLog,v 1.9 2011/04/13 08:43:50 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pwsafe/ChangeLog,v 1.10 2011/04/14 23:38:04 nirbheek Exp $
+
+  14 Apr 2011; Christopher Head (Hawk777) <headch@gmail.com>
+  files/pwsafe-0.2.0-cvs-1.57.patch:
+  Fix bug 363511, cvs was trying to be too smart and broke the patch
 
 *pwsafe-0.2.0-r1 (13 Apr 2011)
 
diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
index 7e8f90a53a1a..7824a01576a7 100644
--- a/app-misc/pwsafe/Manifest
+++ b/app-misc/pwsafe/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pwsafe-0.2.0-cvs-1.57.patch 1468 RMD160 a3b9a9b6cccc5cb47a46ab7a432debcb0983817e SHA1 dd0f758daccf6daaec9ff4cc5951311a55e082a2 SHA256 6e8b05d01293e936397d61656a5ba19787a52d2aa97004bfad03e0facc593acc
+AUX pwsafe-0.2.0-cvs-1.57.patch 1100 RMD160 1bb582a65ad57f8910c1d28b40c0a3737b565db5 SHA1 d557edda13d2612cf3913495f33c3ab51b4a1d42 SHA256 a1e977b8b72f3d1ecd25c8feaa0ffe43dfcad370ba34e8489b2395583f1bdb69
 AUX pwsafe-0.2.0-fake-readline.patch 2667 RMD160 9b686dc4a7d913d3fc4f8cc9e7ee5181bc520a34 SHA1 ff9c2d472ecce5127dcc2fc36c3200fe11dee2f3 SHA256 918293edb9196efce2a75f6e4cf1fc59addd766aa515a158b14f9bc4c3bb2cdd
 AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 RMD160 5c0562a83972d3c5c900f796b91cb4b91428beda SHA1 2ae1cd3d28228692fe70124ac9053e00cbebc229 SHA256 858865706f8cdb30712f210bb7f03edf327934fe3e4ab04376b844de35aa4de3
 AUX pwsafe-0.2.0-printf.patch 1868 RMD160 c00fed82de68927bc681a3a72eadd734eee43c05 SHA1 8dc2124e3b72b2e2c43df98e41ce68a406f71c9b SHA256 927afd52a65d582cd089f1aba3298d17a7d356403ad323c3d2e7526db1279279
 DIST pwsafe-0.2.0.tar.gz 127433 RMD160 5509379f0bb4acea855183e1249395cdc23954d2 SHA1 026643a391796a527a48ffccf93d542113ca79d4 SHA256 61e91dc5114fe014a49afabd574eda5ff49b36c81a6d492c03fcb10ba6af47b7
 EBUILD pwsafe-0.2.0-r1.ebuild 1059 RMD160 929cb9d100726673bf0a4958692e7883df04914e SHA1 c4ab658a1dcba0ca6f621a4901497da2d424faa0 SHA256 d74d3dc83d0e6dcb09930fe552aeaa4ef7ca2d3b686e2badb14ebca5d573311b
 EBUILD pwsafe-0.2.0.ebuild 784 RMD160 2229edcbf7f6b5362a142d2cf453574d0ad4b11e SHA1 c926d2442c468fd6c73bd31e3fa3752870c638ca SHA256 62ddb44fb74a6e2f1d09e64f166bf134aa47f2f208488c036aebd5e0bc39d79e
-MISC ChangeLog 1615 RMD160 3b070afd237c3521fdf15da42238274e7f65345d SHA1 283b6f785f3b94edbaafb0daf2fb8fbc056896a7 SHA256 6aea7ba5f5dc7c98f19d0508a53bae7b3ece8f78e11b27ce5d222ed79a1d5183
+MISC ChangeLog 1784 RMD160 40a17fc0f55ec1ca6aaed557d79fa8771cf1be0f SHA1 8252a495c6866c7e832960d869fcf5c0ccfd551e SHA256 1225a687ae988eb4937c9ab0fa3de8a5eb073ce14856b7f88fb542ae4900f1e6
 MISC metadata.xml 892 RMD160 4ed5a56d4208bf0e0b0670bc2b3126055b14739f SHA1 ab5fc19b2c3ec1bcb50dc507b9ae2e0a0169981a SHA256 9fc3aaf3fc5f70a520cbb7e3617129dfe142a4de48f5e2f70912ab05f00ade67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNpWJCAAoJEO/kOhxWD91ko7EP/AxtFzYr3CjLcY1gxRz3jZ1I
-HGa9l8ZQsOwR7Aw7Ni4wV29HauctM4xJ++WOpDC1GwhZ04OBGd2tVFA749PWUVaW
-jehNf6vrN8J00UWxGxaGkm2gBlxRI7uzt8oWT4ljzcPAXNIqMavXgiryTlWLgl4O
-JOt4TVyqYSj0RopfNUvNLiuDibEVlsAWhutlOXC8z5SswOhUAUkP3AJr4s6yKiAB
-3NeHwvMF2tWJXn14C8mQCtgK/R2xKEJSlVdeJ+bQ5DDYtmRpHkyi0dXWl4rc7SXR
-CsSdB5I//H/hnF7pafqlSFIUOjaEN3zBu+ZPnBaHBMMzKZU1Byk16V1KuRFP4/4F
-PPiWVBnn88Xciaxc8b4Y+xbAeRUGehAccRgjGK7GsIbG17ARNkvYPMXg5XMGRHC9
-p2+oQNHY2nwwuYeZaWgmYzzyltEcv4v+2MFBHWyEvddg8UxAbFr601Rs1iKmNANp
-6cHpF8w4JQ4hXsauC+3MatETQmkRaAac6yAu9QeuTBEdiQfyip69JbjzdGnpZFDw
-9mf/d/GCQSVq5ngn+7Z02YplW9TaoOz9CT9gcyasy8cA7XWd2FgS5OURwldDPQpL
-TvYF1l/nDLSENacLX71O5VnfJ7edvFk/Y/wKiFr76SgoXW8uuZHkaobfR9ScqlJ/
-pBYqtUn7BRhhPVFH71mk
-=LSbn
+iQIcBAEBAgAGBQJNp4VYAAoJEO/kOhxWD91kG3EP/3fMCtFxLVaX5+sJtHC+Se4U
+1w0cz6nZnmU2a2ec3z6efffDWj/zm+0sq91MKvbTa1Oy6M3MVo0NFYj/bH1KR+Pb
+u+AMatnFVaHjsOXZe+6iJcPfDfdJl6rPvQFzO0ZL4cuVkmC6Y+U/3oo+lpCiSpGP
+qS7YFv8XfaZPQY4eYnYS9smPD/ib8HSFOXJShwCyqB8cb5cN3fqtEQQ/+qcMKCHQ
+q9x1dp6i7hpn9V0f+YtjxlL12W1Vht6Zr4UpEfVS5FnbPWixstKQ0akdHwEP9LXK
+nBNH9HNbNz9R0dx5Mrf6m+dkNUxeJt1crzNoDvtLhTtvrqDhFwkpE+G62EViwMWf
+IDfLonohNMu00ldFNNy1xIYxwHZ2mSp2QCVraxYOJw7TLVi/RkWCJYrod8lEJNPD
+A6KsRIMIa/2dpviQczBUwcd3CLS6rvBbvU4XL2Hr3dwIINs0bVj7DR3ot/aZ/Irz
+TR+gn3KcoTqTbil6K8/o8MLia9IzqxSjnxXxkTmfTzXQsd0LPxUlcvTfJdbgMu6y
+bP3Sx+ucMa383a528iD4xI5CFO7fW3OkQ5Q2+h3Xw2s3wghU8QxWald33vhK7xot
+YwPEpqYaPYLoELcS3e6rm7j3bKJi2fJ0FlA7FxbxkhqQZblDrX6SIF1T1sE6j4Mv
+XjMMu1FCuPEzunc+c+32
+=xoY8
 -----END PGP SIGNATURE-----
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch
index 9119abed769e..7f62eb59d429 100644
--- a/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch
@@ -6,15 +6,6 @@ retrieving revision 1.57
 diff -u -r1.56 -r1.57
 --- pwsafe.cpp	30 Sep 2005 10:30:56 -0000	1.56
 +++ pwsafe.cpp	12 Aug 2007 12:33:06 -0000	1.57
-@@ -3,7 +3,7 @@
- 
-    Copyright (C) 2004-2005 Nicolas S. Dade
- 
--   $Id: pwsafe-0.2.0-cvs-1.57.patch,v 1.1 2011/04/13 08:43:49 nirbheek Exp $
-+   $Id: pwsafe-0.2.0-cvs-1.57.patch,v 1.1 2011/04/13 08:43:49 nirbheek Exp $
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
 @@ -3346,6 +3346,12 @@
      }