From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 4 May 2021 22:28:33 +0100
Subject: gentoo resync : 04.05.2021

---
 dev-java/json-simple/Manifest                  |  2 +-
 dev-java/json-simple/json-simple-1.1-r1.ebuild | 30 --------------------------
 dev-java/json-simple/json-simple-1.1-r2.ebuild | 30 ++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 dev-java/json-simple/json-simple-1.1-r1.ebuild
 create mode 100644 dev-java/json-simple/json-simple-1.1-r2.ebuild

(limited to 'dev-java/json-simple')

diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 7170972d1a20..2dfb9c5337a8 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1,3 +1,3 @@
 DIST json-simple-1.1.tar.gz 22154 BLAKE2B 594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570 SHA512 f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
-EBUILD json-simple-1.1-r1.ebuild 591 BLAKE2B 5dd45bf8dead68b43cd9c28a2a55ad9e13a46d14956edb95b6560d6f0c07b4c960a55b71ddff8fe99898fe812272b01ee7b8bb27dcc468234afbdee964b0a846 SHA512 e1f5bfaa2d7ae6cb525cd1c129d10661e62a702362f3a6ad8977c409094feab9d90be0268b50050310665003e4dc6d4defa60a01655300b2db1028d792c52ac8
+EBUILD json-simple-1.1-r2.ebuild 592 BLAKE2B 8b9ded6bf2fa2350ddde5910836999bbdc2e10a5d6a19acd31bd76b523060bebb5df8489507ee089074a3d6ed3ce48cfbcb8f9829689b25a38c56f856451326e SHA512 f5bf630f85bf7347ae5dff5d2877e0b3a79632fc58309da7132d08ba34d146a332778af006ad6cb6c658713060c1f2e9e168d3e071c29096444599b0d2f9679d
 MISC metadata.xml 884 BLAKE2B 93c8109aa04543cfda3354252a56ffd6520106daae5eaca5c428e6a001a8b2d87a3ce3d416c70fb06fb28e22f2b399be0d0911ee59856a9feaa26614f39c0ef5 SHA512 c62d038f6913bb8beb903930ed6d354c89b9b5fa231d9096690d263ee35812aad52696a3d15d74c83d99c02392f5ed3ab997bc6e9d2532cbb4ea12cbaab1ebe9
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild b/dev-java/json-simple/json-simple-1.1-r1.ebuild
deleted file mode 100644
index a91c4fbc828d..000000000000
--- a/dev-java/json-simple/json-simple-1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="tag_release_1_1_1"
-
-DESCRIPTION="Simple Java toolkit for JSON"
-HOMEPAGE="http://www.json.org"
-SRC_URI="https://github.com/fangyidong/json-simple/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-JAVA_SRC_DIR="src/main"
-
-src_prepare() {
-	default
-	rm -rv src/test || die
-}
diff --git a/dev-java/json-simple/json-simple-1.1-r2.ebuild b/dev-java/json-simple/json-simple-1.1-r2.ebuild
new file mode 100644
index 000000000000..d73b7b55ba0c
--- /dev/null
+++ b/dev-java/json-simple/json-simple-1.1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="tag_release_1_1_1"
+
+DESCRIPTION="Simple Java toolkit for JSON"
+HOMEPAGE="http://www.json.org"
+SRC_URI="https://github.com/fangyidong/json-simple/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+
+src_prepare() {
+	default
+	rm -rv src/test || die
+}
-- 
cgit v1.2.3