public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2015-10-20  8:26 Patrice Clement
  0 siblings, 0 replies; 24+ messages in thread
From: Patrice Clement @ 2015-10-20  8:26 UTC (permalink / raw
  To: gentoo-commits

commit:     809fddc0508d6584f6626c35ef4bea8309f0a1c8
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 08:23:37 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 08:24:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809fddc0

dev-java/json: Initial import. Fixes bug 161720.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/json/Manifest             |  1 +
 dev-java/json/json-20150729.ebuild | 33 +++++++++++++++++++++++++++++++++
 dev-java/json/metadata.xml         | 17 +++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
new file mode 100644
index 0000000..00ca07f
--- /dev/null
+++ b/dev-java/json/Manifest
@@ -0,0 +1 @@
+DIST 20150729.zip 52114 SHA256 62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c WHIRLPOOL 393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624

diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
new file mode 100644
index 0000000..6e33966
--- /dev/null
+++ b/dev-java/json/json-20150729.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java implementation of the JavaScript Object Notation"
+HOMEPAGE="http://www.json.org/java/"
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/JSON-java-${PV}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	chmod a-x *.java || die
+	mkdir -p src || die
+	mv *.java src || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README || die
+}

diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
new file mode 100644
index 0000000..d9dd049
--- /dev/null
+++ b/dev-java/json/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		JSON (JavaScript Object Notation) is a lightweight data-interchange format.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">douglascrockford/JSON-java</remote-id>
+	</upstream>
+	<maintainer>
+		<email>chewi@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2015-12-07 10:11 Patrice Clement
  0 siblings, 0 replies; 24+ messages in thread
From: Patrice Clement @ 2015-12-07 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     dfe1c5f0cbabb874a2daaac2380929be8354e40a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 07:56:57 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 10:10:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe1c5f0

dev-java/json: Stable for amd64. Stable for x86 using the ALLARCHES policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/json/json-20150729.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 6e33966..1324c46 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="http://www.json.org/java/"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
+KEYWORDS="amd64 x86"
+IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2016-02-20 14:54 James Le Cuirot
  0 siblings, 0 replies; 24+ messages in thread
From: James Le Cuirot @ 2016-02-20 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3655adbc745713ef555622da8b013e824dba5bec
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 14:54:14 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 14:54:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3655adbc

dev-java/json: Remove pointless maintainer entries

Package-Manager: portage-2.2.27

 dev-java/json/metadata.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
index 925cb10..ed6abb8 100644
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@@ -7,13 +7,7 @@
 	<upstream>
 		<remote-id type="github">douglascrockford/JSON-java</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>chewi@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2016-03-02  4:25 Ian Delaney
  0 siblings, 0 replies; 24+ messages in thread
From: Ian Delaney @ 2016-03-02  4:25 UTC (permalink / raw
  To: gentoo-commits

commit:     2a347c7e055fce36c560000423a7b8a3f5a8b6bf
Author:     Peter Foley <pefoley2 <AT> pefoley <DOT> com>
AuthorDate: Tue Mar  1 22:31:16 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 22:31:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a347c7e

dev-java/json: fix SYSTEM url in metadata.xml

Package-Manager: portage-2.2.27

 dev-java/json/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
index ed6abb8..8ec4071 100644
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
 		JSON (JavaScript Object Notation) is a lightweight data-interchange format.


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2016-10-14  7:11 Austin English
  0 siblings, 0 replies; 24+ messages in thread
From: Austin English @ 2016-10-14  7:11 UTC (permalink / raw
  To: gentoo-commits

commit:     a8750e252df1757c49f924cf9705b6136c1699d8
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 07:10:34 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 07:11:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8750e25

dev-java/json: version bump - 20160212

Package-Manager: portage-2.3.0

 dev-java/json/Manifest             |  1 +
 dev-java/json/json-20160212.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 00ca07f..d8cccd9 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1 +1,2 @@
 DIST 20150729.zip 52114 SHA256 62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c WHIRLPOOL 393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
+DIST 20160212.zip 52295 SHA256 3cdf14d879be05e2749edee7570d8747ce63df72312cb66cc51b37ab258ac5c2 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c WHIRLPOOL 03be8d2069f2653c596baaf82eeeffea45c94272961e9a62f8e04823840813e7a9284592e90d2e6e6bb8c9fbb31aea76229786495d5c0f997e53d9306ebd0047

diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
new file mode 100644
index 00000000..f3193e5
--- /dev/null
+++ b/dev-java/json/json-20160212.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java implementation of the JavaScript Object Notation"
+HOMEPAGE="http://www.json.org/java/"
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/JSON-java-${PV}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	chmod a-x *.java || die
+	mkdir -p src || die
+	mv *.java src || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2017-05-30 22:20 James Le Cuirot
  0 siblings, 0 replies; 24+ messages in thread
From: James Le Cuirot @ 2017-05-30 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     84de5875c639f463abfb51a801b7805558cc65a8
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 22:19:47 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue May 30 22:19:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84de5875

dev-java/json: Fix distfile name, bug #619846

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/json/Manifest             | 4 ++--
 dev-java/json/json-20150729.ebuild | 4 ++--
 dev-java/json/json-20160212.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index d8cccd96d16..3425aa5e99f 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1,2 @@
-DIST 20150729.zip 52114 SHA256 62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c WHIRLPOOL 393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
-DIST 20160212.zip 52295 SHA256 3cdf14d879be05e2749edee7570d8747ce63df72312cb66cc51b37ab258ac5c2 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c WHIRLPOOL 03be8d2069f2653c596baaf82eeeffea45c94272961e9a62f8e04823840813e7a9284592e90d2e6e6bb8c9fbb31aea76229786495d5c0f997e53d9306ebd0047
+DIST json-20150729.zip 52114 SHA256 62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c WHIRLPOOL 393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
+DIST json-20160212.zip 52295 SHA256 3cdf14d879be05e2749edee7570d8747ce63df72312cb66cc51b37ab258ac5c2 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c WHIRLPOOL 03be8d2069f2653c596baaf82eeeffea45c94272961e9a62f8e04823840813e7a9284592e90d2e6e6bb8c9fbb31aea76229786495d5c0f997e53d9306ebd0047

diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 61ec8715621..5c65acbd6d3 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
 HOMEPAGE="http://www.json.org/java/"
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip"
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"

diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
index c2ab4e318ae..db4c7252b88 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
 HOMEPAGE="http://www.json.org/java/"
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip"
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2018-10-13 22:05 Patrice Clement
  0 siblings, 0 replies; 24+ messages in thread
From: Patrice Clement @ 2018-10-13 22:05 UTC (permalink / raw
  To: gentoo-commits

commit:     f98d214ea04a71402128894e577dc740e2fc8689
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 22:04:09 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 22:04:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98d214e

dev-java/json: update HOMEPAGE.

Closes: https://bugs.gentoo.org/668222
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-java/json/json-20150729.ebuild | 4 ++--
 dev-java/json/json-20160212.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 5c65acbd6d3..6af44fe16da 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="http://www.json.org/java/"
+HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="0"

diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
index db4c7252b88..09e93dc0828 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="http://www.json.org/java/"
+HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2019-07-05 10:43 Ulrich Müller
  0 siblings, 0 replies; 24+ messages in thread
From: Ulrich Müller @ 2019-07-05 10:43 UTC (permalink / raw
  To: gentoo-commits

commit:     78b1dea2077c6b16a362b2a4ca06855decd843d9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 10:41:32 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 10:42:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b1dea2

dev-java/json: Fix LICENSE.

Acked-by: Patrice Clement <monsieurp <AT> gentoo.org>
Closes: https://bugs.gentoo.org/689314
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 dev-java/json/json-20150729.ebuild | 5 +++--
 dev-java/json/json-20160212.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 6af44fe16da..1a1e7bda2a3 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
 HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
-LICENSE="BSD"
+
+LICENSE="JSON"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""

diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
index 09e93dc0828..e0a506eb646 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
 HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
-LICENSE="BSD"
+
+LICENSE="JSON"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2022-03-22  7:32 Miroslav Šulc
  0 siblings, 0 replies; 24+ messages in thread
From: Miroslav Šulc @ 2022-03-22  7:32 UTC (permalink / raw
  To: gentoo-commits

commit:     c5ef719e68c724074826c5759576e732d1fc74c5
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 21 23:39:11 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 07:31:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ef719e

dev-java/json: Drop 20160212

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24700
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/json/Manifest             |  1 -
 dev-java/json/json-20160212.ebuild | 33 ---------------------------------
 2 files changed, 34 deletions(-)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index c3bd95bfc118..3cf2b7de9e33 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,3 +1,2 @@
 DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
-DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
 DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0

diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
deleted file mode 100644
index e0a506eb6468..000000000000
--- a/dev-java/json/json-20160212.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="https://github.com/douglascrockford/JSON-java"
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/JSON-java-${PV}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	chmod a-x *.java || die
-	mkdir -p src || die
-	mv *.java src || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2022-03-22  7:32 Miroslav Šulc
  0 siblings, 0 replies; 24+ messages in thread
From: Miroslav Šulc @ 2022-03-22  7:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ea89f2da6f48a43f39854032381b3117a5fc315e
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 21 23:36:46 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 07:31:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea89f2da

dev-java/json: Bump to 20220320, min java 1.8:*

Bug: https://bugs.gentoo.org/833412
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/json/Manifest             |  1 +
 dev-java/json/json-20220320.ebuild | 57 ++++++++++++++++++++++++++++++++++++++
 dev-java/json/metadata.xml         | 11 ++++++--
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 6434984e3124..c3bd95bfc118 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1,3 @@
 DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
 DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
+DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0

diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild
new file mode 100644
index 000000000000..0151873d71ab
--- /dev/null
+++ b/dev-java/json/json-20220320.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 --slot 0 --keywords "~amd64 ~x86" --ebuild json-20220320.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.json:json:20220320"
+# We don't have com.jayway.jsonpath:json-path
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java"
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.jayway.jsonpath:json-path:2.1.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.9.5 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!groupId-not-found!!!
+#		>=dev-java/mockito-1.9.5:0
+#	)
+#"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {README,SECURITY}.md )
+
+S="${WORKDIR}/JSON-java-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,mockito"
+#	JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"src/test/resources"
+#	)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}

diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
index c7e742473ea0..44f2fdc3862b 100644
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<remote-id type="github">douglascrockford/JSON-java</remote-id>
-	</upstream>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/stleary/JSON-java/issues</bugs-to>
+		<doc>https://github.com/stleary/JSON-java/wiki/</doc>
+		<remote-id type="github">stleary/JSON-java</remote-id>
+	</upstream>
+	<longdescription>
+		JSON is a light-weight, language independent, data interchange format. See http://www.JSON.org/ The files in this package implement JSON encoders/decoders in Java. It also includes the capability to convert between JSON and XML, HTTP headers, Cookies, and CDL. This is a reference implementation. There is a large number of JSON packages in Java. Perhaps someday the Java community will standardize on one. Until then, choose carefully. The license includes this restriction: \"The software shall be used for good, not evil.\" If your conscience cannot live with that, then choose a different package.
+	</longdescription>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2022-04-23  1:53 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-04-23  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     bcef5c51a7ca805138a80b369b74a4344d6e3d1d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 01:52:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 01:52:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcef5c51

dev-java/json: Stabilize 20220320 x86, #833412

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/json/json-20220320.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild
index 0151873d71ab..dd9d6c76b588 100644
--- a/dev-java/json/json-20220320.ebuild
+++ b/dev-java/json/json-20220320.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2022-04-23  1:53 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-04-23  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3ddb803654ab6d133637d6bfb8d661a3031d3672
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 01:53:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 01:53:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ddb8036

dev-java/json: Stabilize 20220320 amd64, #833412

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/json/json-20220320.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild
index dd9d6c76b588..86e62eab5ee3 100644
--- a/dev-java/json/json-20220320.ebuild
+++ b/dev-java/json/json-20220320.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2022-04-23  7:05 Miroslav Šulc
  0 siblings, 0 replies; 24+ messages in thread
From: Miroslav Šulc @ 2022-04-23  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     e3d26dbec24b2148ece39d8e73032acb818566eb
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 23 06:07:04 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 07:05:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d26dbe

dev-java/json: drop 20150729

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/json/Manifest             |  1 -
 dev-java/json/json-20150729.ebuild | 33 ---------------------------------
 2 files changed, 34 deletions(-)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 3cf2b7de9e33..c41dbd88dc04 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1 @@
-DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
 DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0

diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
deleted file mode 100644
index a40b3e9d7189..000000000000
--- a/dev-java/json/json-20150729.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="https://github.com/douglascrockford/JSON-java"
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/JSON-java-${PV}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	chmod a-x *.java || die
-	mkdir -p src || die
-	mv *.java src || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2023-12-05 19:46 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2023-12-05 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     ab61974c85818c58079594033083e19d9f674e96
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 19:46:05 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 19:46:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab61974c

dev-java/json: Stabilize 20231013-r1 amd64, #918593

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/json/json-20231013-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild
index a11eb3f69c95..ff26a6b1c443 100644
--- a/dev-java/json/json-20231013-r1.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-01-10 11:40 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2024-01-10 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     0692f03e2c9dc4e33cb57f39165eabdea0655e6d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 11:40:11 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 11:40:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0692f03e

dev-java/json: Stabilize 20231013-r1 x86, #918593

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/json/json-20231013-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild
index ff26a6b1c443..33b11fb0702e 100644
--- a/dev-java/json/json-20231013-r1.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-01-11  9:47 Miroslav Šulc
  0 siblings, 0 replies; 24+ messages in thread
From: Miroslav Šulc @ 2024-01-11  9:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f47f393de5ff7a14f2fb9074e4ee0f17d41054f2
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jan 10 13:40:57 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 09:46:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47f393d

dev-java/json: drop 20220320

Bug: https://bugs.gentoo.org/918529
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34733
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/json/Manifest             |  1 -
 dev-java/json/json-20220320.ebuild | 57 --------------------------------------
 2 files changed, 58 deletions(-)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 549c5a166a89..d2c1e3c3d3b6 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,3 +1,2 @@
-DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
 DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6

diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild
deleted file mode 100644
index 86e62eab5ee3..000000000000
--- a/dev-java/json/json-20220320.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 --slot 0 --keywords "~amd64 ~x86" --ebuild json-20220320.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.json:json:20220320"
-# We don't have com.jayway.jsonpath:json-path
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java"
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.jayway.jsonpath:json-path:2.1.0 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.9.5 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*"
-#	test? (
-#		!!!groupId-not-found!!!
-#		>=dev-java/mockito-1.9.5:0
-#	)
-#"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( {README,SECURITY}.md )
-
-S="${WORKDIR}/JSON-java-${PV}"
-
-JAVA_SRC_DIR="src/main/java"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,mockito"
-#	JAVA_TEST_SRC_DIR="src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"src/test/resources"
-#	)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-02-12  8:41 Miroslav Šulc
  0 siblings, 0 replies; 24+ messages in thread
From: Miroslav Šulc @ 2024-02-12  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     607e23499a76786cc312e328fbef27d46dab2248
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb  6 06:57:59 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 08:37:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607e2349

dev-java/json: add 20240205

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35275
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/json/Manifest             |  2 ++
 dev-java/json/json-20240205.ebuild | 61 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index d2c1e3c3d3b6..4b7a16b268c1 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1,4 @@
 DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
+DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
+DIST json-path-2.4.0.jar 223186 BLAKE2B b184f1b8241bd9b4c5d10662354f31044ea90bddfa7a08c0c995a02e7e50b04d11076d61af2988c2fee49401ad37593f89dd2dbc0bfa0e1b5b1d0653a592eea1 SHA512 b55b30cf85ca12e6a492fd48d4b6bb0b1f3ba610c195aa1a36eda2a80e24bf7688a6a802362d398108e822f6dcb7b713cf421bb4208897fc4f5cc7b8b9b4c97c

diff --git a/dev-java/json/json-20240205.ebuild b/dev-java/json/json-20240205.ebuild
new file mode 100644
index 000000000000..fda4c5cc15d8
--- /dev/null
+++ b/dev-java/json/json-20240205.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java"
+JPV="2.4.0"
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
+	test? (
+		https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
+	)"
+S="${WORKDIR}/JSON-java-${PV}"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/asm:9
+		dev-java/json-smart:2
+		dev-java/mockito:4
+		dev-java/slf4j-api:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,SECURITY}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.json"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	asm-9
+	json-smart-2
+	junit-4
+	mockito-4
+	slf4j-api
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-03-12 14:38 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2024-03-12 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e6ddd033fc289d5a707947a12ab31fc0c0d2593c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 14:37:59 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 14:37:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ddd033

dev-java/json: Stabilize 20240205 amd64, #926808

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/json/json-20240205.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/json/json-20240205.ebuild b/dev-java/json/json-20240205.ebuild
index fda4c5cc15d8..b38dc12dd901 100644
--- a/dev-java/json/json-20240205.ebuild
+++ b/dev-java/json/json-20240205.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-04-11 17:56 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2024-04-11 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     64ff94e3095b0f975876e4dfeeddf5ee4865b5f7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Mar 15 21:58:32 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 17:54:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ff94e3

dev-java/json: set -Xss2M

also update json-path 2.4.0 -> 2.9.0 ( CVE-2023-51074 )

Closes: https://bugs.gentoo.org/927094
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35775
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/json/Manifest                                          | 2 +-
 dev-java/json/{json-20240205.ebuild => json-20240205-r1.ebuild} | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 4b7a16b268c1..05f94127628e 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,4 +1,4 @@
 DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
 DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
-DIST json-path-2.4.0.jar 223186 BLAKE2B b184f1b8241bd9b4c5d10662354f31044ea90bddfa7a08c0c995a02e7e50b04d11076d61af2988c2fee49401ad37593f89dd2dbc0bfa0e1b5b1d0653a592eea1 SHA512 b55b30cf85ca12e6a492fd48d4b6bb0b1f3ba610c195aa1a36eda2a80e24bf7688a6a802362d398108e822f6dcb7b713cf421bb4208897fc4f5cc7b8b9b4c97c
+DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a

diff --git a/dev-java/json/json-20240205.ebuild b/dev-java/json/json-20240205-r1.ebuild
similarity index 96%
rename from dev-java/json/json-20240205.ebuild
rename to dev-java/json/json-20240205-r1.ebuild
index b38dc12dd901..49f6e727afd8 100644
--- a/dev-java/json/json-20240205.ebuild
+++ b/dev-java/json/json-20240205-r1.ebuild
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A reference implementation of a JSON package in Java"
 HOMEPAGE="https://github.com/stleary/JSON-java"
-JPV="2.4.0"
+JPV="2.9.0"
 SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
 	test? (
 		https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
@@ -50,6 +50,7 @@ JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 src_test() {
+	JAVA_TEST_EXTRA_ARGS=( -Xss2M )
 	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
 
 	local vm_version="$(java-config -g PROVIDES_VERSION)"


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-07-07 10:16 Miroslav Šulc
  0 siblings, 0 replies; 24+ messages in thread
From: Miroslav Šulc @ 2024-07-07 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8bfd6777a0e10eab4790c58cac598987f7379ab0
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jul  2 06:04:45 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jul  7 10:14:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfd6777

dev-java/json: add 20240303

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37469/commits/31edb4127fec5b2528ec9c0bf65197e2a78af606
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/json/Manifest             |  1 +
 dev-java/json/json-20240303.ebuild | 81 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 05f94127628e..d2c92e99c74d 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,4 +1,5 @@
 DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
 DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
+DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9
 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
 DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a

diff --git a/dev-java/json/json-20240303.ebuild b/dev-java/json/json-20240303.ebuild
new file mode 100644
index 000000000000..5e807e77efd0
--- /dev/null
+++ b/dev-java/json/json-20240303.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java"
+JPV="2.9.0"
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
+	test? (
+		https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
+	)"
+S="${WORKDIR}/JSON-java-${PV}"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/asm:9
+		dev-java/json-smart:2
+		dev-java/mockito:4
+		dev-java/slf4j-api:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,SECURITY}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.json"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	asm-9
+	json-smart-2
+	junit-4
+	mockito-4
+	slf4j-api
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="2048M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_test() {
+	# setting Xms for bug #930723
+	# gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"
+	JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-07-29 15:15 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2024-07-29 15:15 UTC (permalink / raw
  To: gentoo-commits

commit:     2ba1910ac10793e5fb6e6644eab44624a2af52b0
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jul 29 09:35:05 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 15:14:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba1910a

dev-java/json: unkeyword 20231013-r1 for x86

Closes: https://bugs.gentoo.org/930723
Closes: https://bugs.gentoo.org/926808
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/json/json-20231013-r1.ebuild | 2 +-
 dev-java/json/json-20240205-r1.ebuild | 2 +-
 dev-java/json/json-20240303.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild
index 33b11fb0702e..e036642fff8e 100644
--- a/dev-java/json/json-20231013-r1.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

diff --git a/dev-java/json/json-20240205-r1.ebuild b/dev-java/json/json-20240205-r1.ebuild
index 49f6e727afd8..8dcbc599e326 100644
--- a/dev-java/json/json-20240205-r1.ebuild
+++ b/dev-java/json/json-20240205-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

diff --git a/dev-java/json/json-20240303.ebuild b/dev-java/json/json-20240303.ebuild
index 5e807e77efd0..c53dca8a5657 100644
--- a/dev-java/json/json-20240303.ebuild
+++ b/dev-java/json/json-20240303.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-07-29 15:15 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2024-07-29 15:15 UTC (permalink / raw
  To: gentoo-commits

commit:     36fa656d2ba9dc0269665fc8be8f493c0d1a9345
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jul 29 09:41:06 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 15:14:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36fa656d

dev-java/json: drop 20231013-r1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37779
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/json/Manifest                |  2 --
 dev-java/json/json-20231013-r1.ebuild | 65 -----------------------------------
 2 files changed, 67 deletions(-)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index d2c92e99c74d..a288e8afcbcd 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,3 @@
-DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
 DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
 DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9
-DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
 DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a

diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild
deleted file mode 100644
index e036642fff8e..000000000000
--- a/dev-java/json/json-20231013-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.json:json:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java"
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
-	test? (
-		https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar
-	)"
-S="${WORKDIR}/JSON-java-${PV}"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/asm:9
-		dev-java/json-smart:2
-		dev-java/mockito:4
-		dev-java/slf4j-api:0
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,SECURITY}.md )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.json"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
-	asm-9
-	json-smart-2
-	junit-4
-	mockito-4
-	slf4j-api
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
-
-src_test() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-2.1.0.jar" # Test compile dependency
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 17; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-	fi
-	java-pkg-simple_src_test
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-08-11 17:24 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2024-08-11 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     4ee4cd8327a2d08a700f07e61083d819a0f8a0a2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 17:24:23 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 17:24:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee4cd83

dev-java/json: Stabilize 20240303 amd64, #937746

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/json/json-20240303.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/json/json-20240303.ebuild b/dev-java/json/json-20240303.ebuild
index c53dca8a5657..b039a3797e52 100644
--- a/dev-java/json/json-20240303.ebuild
+++ b/dev-java/json/json-20240303.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/json/
@ 2024-08-12  9:27 Miroslav Šulc
  0 siblings, 0 replies; 24+ messages in thread
From: Miroslav Šulc @ 2024-08-12  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     840fc3a65626c05148b534938522467e94817d6a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Aug 11 19:05:16 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 09:26:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840fc3a6

dev-java/json: drop 20240205-r1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38106
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/json/Manifest                |  1 -
 dev-java/json/json-20240205-r1.ebuild | 62 -----------------------------------
 2 files changed, 63 deletions(-)

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index a288e8afcbcd..b2d756b94a7f 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,3 +1,2 @@
-DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
 DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9
 DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a

diff --git a/dev-java/json/json-20240205-r1.ebuild b/dev-java/json/json-20240205-r1.ebuild
deleted file mode 100644
index 8dcbc599e326..000000000000
--- a/dev-java/json/json-20240205-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.json:json:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java"
-JPV="2.9.0"
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
-	test? (
-		https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
-	)"
-S="${WORKDIR}/JSON-java-${PV}"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/asm:9
-		dev-java/json-smart:2
-		dev-java/mockito:4
-		dev-java/slf4j-api:0
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,SECURITY}.md )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.json"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
-	asm-9
-	json-smart-2
-	junit-4
-	mockito-4
-	slf4j-api
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
-	JAVA_TEST_EXTRA_ARGS=( -Xss2M )
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 17; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-	fi
-	java-pkg-simple_src_test
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
end of thread, other threads:[~2024-08-12  9:27 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-20  8:26 [gentoo-commits] repo/gentoo:master commit in: dev-java/json/ Patrice Clement
  -- strict thread matches above, loose matches on Subject: below --
2015-12-07 10:11 Patrice Clement
2016-02-20 14:54 James Le Cuirot
2016-03-02  4:25 Ian Delaney
2016-10-14  7:11 Austin English
2017-05-30 22:20 James Le Cuirot
2018-10-13 22:05 Patrice Clement
2019-07-05 10:43 Ulrich Müller
2022-03-22  7:32 Miroslav Šulc
2022-03-22  7:32 Miroslav Šulc
2022-04-23  1:53 Sam James
2022-04-23  1:53 Sam James
2022-04-23  7:05 Miroslav Šulc
2023-12-05 19:46 Arthur Zamarin
2024-01-10 11:40 Arthur Zamarin
2024-01-11  9:47 Miroslav Šulc
2024-02-12  8:41 Miroslav Šulc
2024-03-12 14:38 Arthur Zamarin
2024-04-11 17:56 Arthur Zamarin
2024-07-07 10:16 Miroslav Šulc
2024-07-29 15:15 Arthur Zamarin
2024-07-29 15:15 Arthur Zamarin
2024-08-11 17:24 Arthur Zamarin
2024-08-12  9:27 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox