Remove CVS keywords from the patch.

Package-Manager: portage-2.1.5_rc3

3 files changed, 11 insertions, 80 deletions

diff --git a/dev-java/json-simple/ChangeLog b/dev-java/json-simple/ChangeLog
index 8b0dfe19b2a7..48bc90e28b7d 100644
--- a/dev-java/json-simple/ChangeLog
+++ b/dev-java/json-simple/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/json-simple
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/ChangeLog,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/ChangeLog,v 1.2 2008/04/20 21:21:14 betelgeuse Exp $
+
+  20 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
+  files/extra-constructors-from-azureus.patch:
+  Remove CVS keywords from the patch.
 
 *json-simple-20080420 (20 Apr 2008)
 
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 6c05693c28fe..64f354010366 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 AUX build.xml 1524 RMD160 faadd94f56f942c6e8f0b10b77fc7be143fe3751 SHA1 2a0d962ace8a4ba111dafeb22ba5187ed47963c4 SHA256 4dc2f58cb9611dbe1e03aee77fa48c17b98f3da93b91ac8655bda5468cf6f8c8
-AUX extra-constructors-from-azureus.patch 5464 RMD160 1cadb186e006b9adef1f6affde14c97c8a34d77c SHA1 25f64966701bc968a666493638ecac076b1c55df SHA256 07e8df19e2b7729611b98e43e10b6513f93eb3a3312a4b0a29ae8db42284fa0a
+AUX extra-constructors-from-azureus.patch 1577 RMD160 691ccaabf015ee4c5bf94ac66524633b6ee8ae53 SHA1 fcd28eaa41896bf8c6f795d0ad73e3c8c99a2101 SHA256 c8e9f989c7c8141f712fb154770d50362fc0198f0b8bb56a9f304f4d594f26d8
 DIST json_simple-20080420.zip 50835 RMD160 7cbc378e159d5038112a1edea1c8fd08209cae5b SHA1 cbb49ca71d2beeb4a7e7344736c9384957af9d8e SHA256 0942dabbf8bea388caf6c1cbb550dbbabfa9e359fb2a9e980d660b572c3a0077
 EBUILD json-simple-20080420.ebuild 1045 RMD160 3d00e4899dfb194fa80109dc3d34ca1b99d2a9a4 SHA1 acda3cdc120375178dbf44c9edc9f981f92f8267 SHA256 098e7e45b9f9ea7dc198632822ed1003a903d9651bdc034e3737077e1a10503f
-MISC ChangeLog 515 RMD160 434780abdfd0c5b7790a6979c037f978875518de SHA1 83ed927e2a8835ae283af599f56c3cfdcddced1f SHA256 ffa8d45507dba4bc655e7e9387be9e84207c825686f9fd5b7be6941a6f1dd4ef
+MISC ChangeLog 654 RMD160 616341ee7be30f06a841abd8f1dea13ce2f6981b SHA1 4a7eeed3287792ce44adbabdb279af99386e16f9 SHA256 5464f657d68e658da2ae01159f95cf7267a8c9a216175dd20c554656e998d7db
 MISC metadata.xml 729 RMD160 872a35b2ec851360e4e2b0c130935cdcd0c295be SHA1 59937765a382a57adbf49e5eef1f1a0fe445f08a SHA256 35ca99cca4fd36ebd8e646c31f67df981f73ce9798be98e98551c054ed102561
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgLVBAACgkQcxLzpIGCsLRs1ACfduHEb7g6M8EGDxjhYpdAGNEg
-u1QAn1w8NWede1vm5BIaGFoh/Wo38GiQ
-=CI1u
+iEYEARECAAYFAkgLs68ACgkQcxLzpIGCsLS6bgCfUDtgcx7vEjM0ftY5/5ty/JbC
+1rAAn10ejedpJlFzypOVf9gYxSQAuJkg
+=ic+o
 -----END PGP SIGNATURE-----
diff --git a/dev-java/json-simple/files/extra-constructors-from-azureus.patch b/dev-java/json-simple/files/extra-constructors-from-azureus.patch
index 825daf9feda5..b89aae2f7b66 100644
--- a/dev-java/json-simple/files/extra-constructors-from-azureus.patch
+++ b/dev-java/json-simple/files/extra-constructors-from-azureus.patch
@@ -1,30 +1,6 @@
-Only in work/org/json/simple: AUTHORS.txt
-diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/ItemList.java work/org/json/simple/ItemList.java
---- /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/ItemList.java	2006-04-16 04:04:26.000000000 +0300
-+++ work/org/json/simple/ItemList.java	2007-06-04 17:43:56.000000000 +0300
-@@ -1,5 +1,5 @@
- /*

-- * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-+ * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-  * Created on 2006-3-24

-  */

- package org.json.simple;

 diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/JSONArray.java work/org/json/simple/JSONArray.java
 --- /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/JSONArray.java	2006-04-16 04:04:24.000000000 +0300
 +++ work/org/json/simple/JSONArray.java	2007-06-04 17:43:56.000000000 +0300
-@@ -1,10 +1,11 @@
- /*

-- * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-+ * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-  * Created on 2006-4-10

-  */

- package org.json.simple;

- 

- import java.util.ArrayList;

-+import java.util.Collection;

- import java.util.Iterator;

- 

- 

 @@ -12,6 +13,18 @@
   * @author FangYidong<fangyidong@yahoo.com.cn>

   */

@@ -33,7 +9,7 @@ diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org
 +		super();

 +	}

 +

-+	public JSONArray(Collection arg0) {

++	public JSONArray(java.util.Collection arg0) {

 +		super(arg0);

 +	}

 +

@@ -47,13 +23,6 @@ diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org
 diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/JSONObject.java work/org/json/simple/JSONObject.java
 --- /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/JSONObject.java	2006-04-16 11:26:38.000000000 +0300
 +++ work/org/json/simple/JSONObject.java	2007-06-04 17:43:56.000000000 +0300
-@@ -1,5 +1,5 @@
- /*

-- * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-+ * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-  * Created on 2006-4-10

-  */

- package org.json.simple;

 @@ -13,6 +13,22 @@
   */

  public class JSONObject extends HashMap{

@@ -77,45 +46,3 @@ diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org
  	public String toString(){

  		ItemList list=new ItemList();

  		Iterator iter=entrySet().iterator();

-diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/JSONValue.java work/org/json/simple/JSONValue.java
---- /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/JSONValue.java	2006-04-16 04:04:42.000000000 +0300
-+++ work/org/json/simple/JSONValue.java	2007-06-04 17:43:56.000000000 +0300
-@@ -1,5 +1,5 @@
- /*

-- * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-+ * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-  * Created on 2006-4-15

-  */

- package org.json.simple;

-Only in work/org/json/simple: LICENSE.txt
-diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/parser/JSONParser.java work/org/json/simple/parser/JSONParser.java
---- /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/parser/JSONParser.java	2006-04-16 04:04:44.000000000 +0300
-+++ work/org/json/simple/parser/JSONParser.java	2007-06-04 17:43:56.000000000 +0300
-@@ -1,5 +1,5 @@
- /*

-- * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-+ * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-  * Created on 2006-4-15

-  */

- package org.json.simple.parser;

-diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/parser/Yytoken.java work/org/json/simple/parser/Yytoken.java
---- /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/parser/Yytoken.java	2006-04-16 04:04:44.000000000 +0300
-+++ work/org/json/simple/parser/Yytoken.java	2007-06-04 17:43:56.000000000 +0300
-@@ -1,5 +1,5 @@
- /*

-- * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-+ * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-  * Created on 2006-4-15

-  */

- package org.json.simple.parser;

-Only in work/org/json/simple: README.txt
-diff -ur /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/Test.java work/org/json/simple/Test.java
---- /var/tmp/portage/dev-java/json-simple-20080420/work/json_simple/src/org/json/simple/Test.java	2006-04-16 13:56:20.000000000 +0300
-+++ work/org/json/simple/Test.java	2007-06-04 17:43:56.000000000 +0300
-@@ -1,5 +1,5 @@
- /*

-- * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-+ * $Id: extra-constructors-from-azureus.patch,v 1.1 2008/04/20 14:33:15 betelgeuse Exp $

-  * Created on 2006-4-15

-  */

- package org.json.simple;