From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 dev-java/glassfish-persistence/Manifest            |  2 +-
 .../glassfish-persistence-1.0-r1.ebuild            | 28 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'dev-java/glassfish-persistence')

diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
index 4726c7762b4e..b3d111003d11 100644
--- a/dev-java/glassfish-persistence/Manifest
+++ b/dev-java/glassfish-persistence/Manifest
@@ -1,4 +1,4 @@
 AUX glassfish-persistence-1.0-python2.7-sax-parser.patch 286 BLAKE2B 49667ba4e41eadfea73fc8b53cf61f5fafd4654292ecd1b2e2b653411d252b1ff8bc40e6c9e0cd8fdd1375ba86a358495415a68ff1466f857d96cfd90ce5605a SHA512 ba7c32d86991407d45a86d640d95007cc47dcd28c74f441e38840206093653dc31e4824d4986cd9cd60d44fba0c1f4365f9348a9362529531fa9410e9fd5cad1
 DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48
-EBUILD glassfish-persistence-1.0-r1.ebuild 814 BLAKE2B cdd2d0a552118d855c34056983e69a1453506abc535cd2cf49a1f9460dce7e809805172bea2f6fcf7c3efdd32a30441be1a2b3a6b6229f37e861c6ddb33b975f SHA512 92366fb448d2a99342c812b80edad37c0ca8c4486fbe561252f443c91ac585fd8b63abb82ed8a58b03d44d9199d930e2a6be38779732fae2448290a657934000
+EBUILD glassfish-persistence-1.0-r1.ebuild 809 BLAKE2B 507f47d8a7d2ad043218997f2fb0bf402111ff5b384bffb3fa9523bd4a92867bb5715b8ce7d102d34988de6f4892cc1eec59c6a17b88d4ec56c7adbc9fad029a SHA512 028a1ffc006759847744735231c8979bee0ea3c15a180119a7cc99d4f60a9990cb36681a35a63b5409ecd3bd12a16f0d2b4dfa6377b0bf0f018e9b6f1d50f614
 MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
index f7157f5db556..898ef4606059 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Glassfish implementation of persistence API"
 HOMEPAGE="https://glassfish.java.net/"
 SRC_URI="http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip"
+S="${WORKDIR}/glassfish"
 
 LICENSE="CDDL"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}/glassfish"
 
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-python2.7-sax-parser.patch #414807
-}
+BDEPEND="app-arch/unzip"
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
 
 EANT_BUILD_XML="persistence-api/build.xml"
 EANT_BUILD_TARGET="all"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python2.7-sax-parser.patch
+)
+
+src_prepare() {
+	default
+}
+
 src_install() {
 	cd "${WORKDIR}"/publish/glassfish || die
 	java-pkg_newjar lib/javaee.jar
-- 
cgit v1.2.3