Rename date tagged version as a pre and version bump

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 125 insertions, 6 deletions

diff --git a/dev-java/json-simple/ChangeLog b/dev-java/json-simple/ChangeLog
index 155551ab5a8c..df22e9343e4a 100644
--- a/dev-java/json-simple/ChangeLog
+++ b/dev-java/json-simple/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/json-simple
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/ChangeLog,v 1.9 2009/03/20 19:47:00 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/ChangeLog,v 1.10 2011/09/25 09:21:35 serkan Exp $
+
+*json-simple-1.1 (25 Sep 2011)
+*json-simple-1.0_pre20080420 (25 Sep 2011)
+
+  25 Sep 2011; Serkan Kaba <serkan@gentoo.org>
+  +json-simple-1.0_pre20080420.ebuild, +json-simple-1.1.ebuild,
+  +files/json-simple-1.1-extra-constructors-from-azureus.patch,
+  -json-simple-20080420.ebuild:
+  Rename date tagged version as a pre and version bump
 
   20 Mar 2009; Joseph Jezak <josejx@gentoo.org> json-simple-20080420.ebuild:
   Marked ppc stable.
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 7f73283ad18f..9fc958473504 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml 1524 RMD160 faadd94f56f942c6e8f0b10b77fc7be143fe3751 SHA1 2a0d962ace8a4ba111dafeb22ba5187ed47963c4 SHA256 4dc2f58cb9611dbe1e03aee77fa48c17b98f3da93b91ac8655bda5468cf6f8c8
 AUX extra-constructors-from-azureus.patch 1225 RMD160 9a9ac7d765445167eb6222155ed00010f6b11c97 SHA1 660f34f9a884d92154515a645e8d1e3a328cf762 SHA256 c5a09c8248c7d221cd280bb059bc556adf0d6de03acacc60ae53a93c53de303b
+AUX json-simple-1.1-extra-constructors-from-azureus.patch 1943 RMD160 f8f2589e06001315aa28b7ce0e271ed3a941be5a SHA1 52f56e0bdeeabf335a3fdc3eca3b5bc16da23627 SHA256 4d2721add0dae5abfaa5d2b31be61dff88e72db1b69e4f3b8c8263b4541673be
+DIST json_simple-1.1-all.zip 44814 RMD160 dae9a97ffcefdefc9b7c84cd2375573485f60b23 SHA1 d38248a9eac573d3b79257d7080778dbf584ec35 SHA256 007568a235ed018142756080e73ec7582af83bd90bbdc227489d186e1529ccf7
 DIST json_simple-20080420.zip 50835 RMD160 7cbc378e159d5038112a1edea1c8fd08209cae5b SHA1 cbb49ca71d2beeb4a7e7344736c9384957af9d8e SHA256 0942dabbf8bea388caf6c1cbb550dbbabfa9e359fb2a9e980d660b572c3a0077
-EBUILD json-simple-20080420.ebuild 1065 RMD160 9d04c559c1b10a6daeceefb3090f980a56def7c5 SHA1 c34b43ff9133b60f1bfec6a3630230fdcac692eb SHA256 b6c5442421d41c6e92b5851f5e650192879b5aeb865624536ac4443f81b8afef
-MISC ChangeLog 1486 RMD160 c08688a76e4f8c865127d4887a157d6fa178609e SHA1 75d39edc51ed2e3f6e899f1041df5c36af3ceba4 SHA256 4383dbf16ac4dcbe79e9979992ceb0897b7d82740754689160add5994224b275
+EBUILD json-simple-1.0_pre20080420.ebuild 1080 RMD160 5ab018ef51249c25ec916a06283aa1fa88cb63d7 SHA1 b263765847b98a78fb975ac79466a0841524bb1c SHA256 13741fb298b680b544b8c7e53656318e8f8a9f3dbfde4fc57d74007466d239bb
+EBUILD json-simple-1.1.ebuild 1126 RMD160 953971ac806077deddb1f59ee24757f8b618b913 SHA1 e924fa98bfac50880246375be751cffc6e69060a SHA256 cef8b2b31f4c0db2da67254378ee710980a2fed12e09b8497c024cd55fa5e61a
+MISC ChangeLog 1825 RMD160 247398d091d0a06dff1ada7f79ec63cbeec11b5a SHA1 e8590f20a0d7929f41e3653fdb48631fe121b6d9 SHA256 bc3f1f6b0a6d57293f7e8c4a92b437adb850aba2fa7c392cec3226a15d3d0cc9
 MISC metadata.xml 729 RMD160 872a35b2ec851360e4e2b0c130935cdcd0c295be SHA1 59937765a382a57adbf49e5eef1f1a0fe445f08a SHA256 35ca99cca4fd36ebd8e646c31f67df981f73ce9798be98e98551c054ed102561
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5+8qgACgkQRh6X64ivZaL/3ACeOXABMgArba9Vyhqo46hiOvOU
+AjcAn3P1If6n5DdkqHqtZNEv1IbSDWE1
+=T1Kq
+-----END PGP SIGNATURE-----
diff --git a/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch b/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
new file mode 100644
index 000000000000..5b45a973e41d
--- /dev/null
+++ b/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
@@ -0,0 +1,48 @@
+diff -Nur json_simple-1.1-all/src/org/json/simple/JSONArray.java json_simple-1.1-all_patched//src/org/json/simple/JSONArray.java
+--- json_simple-1.1-all/src/org/json/simple/JSONArray.java	2009-02-01 12:45:34.000000000 +0200
++++ json_simple-1.1-all_patched//src/org/json/simple/JSONArray.java	2011-09-25 11:23:37.398818358 +0300
+@@ -19,6 +19,18 @@
+ public class JSONArray extends ArrayList implements List, JSONAware, JSONStreamAware {

+ 	private static final long serialVersionUID = 3957988303675231981L;

+ 

++	public JSONArray() {

++		super();

++	}

++

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

++		super(arg0);

++	}

++

++	public JSONArray(int initialCapacity) {

++		super(initialCapacity);

++	}

++

+     /**

+      * Encode a list into JSON text and write it to out. 

+      * If this list is also a JSONStreamAware or a JSONAware, JSONStreamAware and JSONAware specific behaviours will be ignored at this top level.

+diff -Nur json_simple-1.1-all/src/org/json/simple/JSONObject.java json_simple-1.1-all_patched//src/org/json/simple/JSONObject.java
+--- json_simple-1.1-all/src/org/json/simple/JSONObject.java	2009-02-01 12:45:34.000000000 +0200
++++ json_simple-1.1-all_patched//src/org/json/simple/JSONObject.java	2011-09-25 11:24:34.815103065 +0300
+@@ -18,6 +18,22 @@
+ public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware{

+ 	private static final long serialVersionUID = -503443796854799292L;

+ 

++	public JSONObject() {

++		super();

++	}

++

++	public JSONObject(int initialCapacity, float loadFactor) {

++		super(initialCapacity, loadFactor);

++	}

++

++	public JSONObject(int initialCapacity) {

++		super(initialCapacity);

++	}

++

++	public JSONObject(Map arg0) {

++		super(arg0);

++	}

++

+     /**

+      * Encode a map into JSON text and write it to out.

+      * If this map is also a JSONAware or JSONStreamAware, JSONAware or JSONStreamAware specific behaviours will be ignored at this top level.

diff --git a/dev-java/json-simple/json-simple-20080420.ebuild b/dev-java/json-simple/json-simple-1.0_pre20080420.ebuild
index 80b5e73b5118..15f9e2d60207 100644
--- a/dev-java/json-simple/json-simple-20080420.ebuild
+++ b/dev-java/json-simple/json-simple-1.0_pre20080420.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/json-simple-20080420.ebuild,v 1.7 2009/03/20 19:47:00 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/json-simple-1.0_pre20080420.ebuild,v 1.1 2011/09/25 09:21:35 serkan Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -17,6 +17,7 @@ SRC_URI="mirror://gentoo/${MY_PN}-20080420.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip"
diff --git a/dev-java/json-simple/json-simple-1.1.ebuild b/dev-java/json-simple/json-simple-1.1.ebuild
new file mode 100644
index 000000000000..9e3c88bef68d
--- /dev/null
+++ b/dev-java/json-simple/json-simple-1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/json-simple-1.1.ebuild,v 1.1 2011/09/25 09:21:35 serkan Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Java toolkit for JSON"
+HOMEPAGE="http://www.json.org"
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}-all"
+SRC_URI="http://json-simple.googlecode.com/files/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-extra-constructors-from-azureus.patch"
+	rm -rv build lib || die
+}
+
+#JAVA_ANT_ENCODING="ISO-8859-1"
+#EANT_BUILD_TARGET="dist"
+
+JAVA_PKG_BSFIX_NAME+=" test.xml"
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant -f test.xml
+}
+
+src_install() {
+	java-pkg_newjar lib/${MY_P/-all/}.jar ${PN}.jar
+	dodoc README.txt AUTHORS.txt ChangeLog.txt || die
+	use source && java-pkg_dosrc src/org
+}