[gentoo-commits] repo/gentoo:master commit in: dev-db/db-je/files/, dev-db/db-je/

[gentoo-commits] repo/gentoo:master commit in: dev-db/db-je/files/, dev-db/db-je/

[Michał Górny]

commit:     ecc25873cd730321d24b32f0e3757d6906e6c3e2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 08:14:57 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 08:23:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc25873

dev-db/db-je: Bump to EAPI 7

Closes: https://bugs.gentoo.org/697364
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-db/db-je/db-je-3.3.75.ebuild                   | 26 +++++++++++-----------
 .../db-je/files/db-je-3.3.75-optional-test.patch   |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dev-db/db-je/db-je-3.3.75.ebuild b/dev-db/db-je/db-je-3.3.75.ebuild
index 4e4723e4f4c..943c9c9fd98 100644
--- a/dev-db/db-je/db-je-3.3.75.ebuild
+++ b/dev-db/db-je/db-je-3.3.75.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -9,30 +9,30 @@ inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A high performance, transactional storage engine written entirely in Java"
 HOMEPAGE="https://www.oracle.com/database/berkeley-db/java-edition.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${P/db-/}.tar.gz"
+SRC_URI="https://download.oracle.com/berkeley-db/${P/db-/}.tar.gz"
+S=${WORKDIR}/${P/db-/}
 
 LICENSE="Sleepycat BSD"
 SLOT="3.3"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.5"
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-core:0"
 RDEPEND=">=virtual/jre-1.5"
-S=${WORKDIR}/${P/db-/}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	epatch "${FILESDIR}"/${P}-optional-test.patch
-	rm -rf docs
+EANT_DOC_TARGET="javadoc-all"
+EANT_EXTRA_ARGS="-Dnotest=true"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}-optional-test.patch
+	rm -r docs || die
 	cd lib || die
-	rm -v *jar || die
+	rm -v *.jar || die
 	java-pkg_jar-from --build-only ant-core ant.jar
 }
 
-EANT_DOC_TARGET="javadoc-all"
-EANT_EXTRA_ARGS="-Dnotest=true"
-
 src_install() {
 	java-pkg_dojar build/lib/je.jar
 	use doc && java-pkg_dojavadoc docs

diff --git a/dev-db/db-je/files/db-je-3.3.75-optional-test.patch b/dev-db/db-je/files/db-je-3.3.75-optional-test.patch
index e8f7600398e..ac23185c2ba 100644
--- a/dev-db/db-je/files/db-je-3.3.75-optional-test.patch
+++ b/dev-db/db-je/files/db-je-3.3.75-optional-test.patch
@@ -1,5 +1,5 @@
---- build.xml	2008-06-11 05:25:20.000000000 +0200
-+++ build.xml.new	2008-08-22 15:59:53.000000000 +0200
+--- a/build.xml	2008-06-11 05:25:20.000000000 +0200
++++ b/build.xml	2008-08-22 15:59:53.000000000 +0200
 @@ -102,6 +102,7 @@
      <path id="empty.classpath"/>