From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- dev-java/json/Manifest | 6 ++-- dev-java/json/json-20160212.ebuild | 33 ---------------------- dev-java/json/json-20220320.ebuild | 57 ++++++++++++++++++++++++++++++++++++++ dev-java/json/metadata.xml | 11 ++++++-- 4 files changed, 68 insertions(+), 39 deletions(-) delete mode 100644 dev-java/json/json-20160212.ebuild create mode 100644 dev-java/json/json-20220320.ebuild (limited to 'dev-java/json') diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index b0580a303930..694a2582cfe5 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,5 +1,5 @@ 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 EBUILD json-20150729.ebuild 700 BLAKE2B 28d118fc07ab4f4bc52e00f43d36f49291fa69fc91304ee2d89df9c111e72a09f7eea10e659d06ac8eccd5c3a9d038d7ac57dca5f50fcf9d9246873bba6559c9 SHA512 112177c08691722e2b9e0d0bbcc11bbe68da87c281a4918ff6e4ef64160b7137ecb1187a697bf0f7c3db01acc9cc4baa79a67b7e9385af9cdbf5b3cd4036b26c -EBUILD json-20160212.ebuild 700 BLAKE2B 982fb6fc37f874641f6984877eef6ea42a5b106fcfc59080f85737ed2ccc61df3834c7ef5d974a155ff822bdcf55d91dc8503eec38d7229178b2b4b51fb84be4 SHA512 23df25d4363faa278ab84475c26b992374f61a39ed816868f8695567f66e0bfae4e54c6021bca5c38dc87110206146576cd14b02d713ca576d2c6d60f8cc38b4 -MISC metadata.xml 328 BLAKE2B d2b6f07acd968fa03336692666d5a76cc7036d99a661652f5ac542f967cf3dcb334eb7f33a25592086d269eee6dfc808cc05bc06876062071f325b4f3df7ddbd SHA512 95a7a77c5802e88f4001a9e74edefbbed6f6a321150d953dd7e584bfe45574e7079f6ca0d3bd45f25de20e1ff9d7e3eaa1c03e0b607ad176ec7099c5d6489a0b +EBUILD json-20220320.ebuild 1484 BLAKE2B 9da92b57c7ca603d4e81c2affe103f33ad2c52012782a256b9fbffd246f8b598bf720ed80afee7428a98cb80a12e63c5a18ede9686247a2c86f0c62d0a61b852 SHA512 64e2e83d134dff838139499715c7b8aedd5ead16086d9bf6ce2cdbdc2628ee29d4d68f736f8efdd271067d0d1cc99ade7bc3b5cf5494a9e8c81ea03235bb2141 +MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b 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 -} 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 @@ - - douglascrockford/JSON-java - java@gentoo.org Java + + https://github.com/stleary/JSON-java/issues + https://github.com/stleary/JSON-java/wiki/ + stleary/JSON-java + + + 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. + -- cgit v1.2.3