gentoo resync : 19.03.2019

3 files changed, 16 insertions, 17 deletions

diff --git a/dev-java/jdbm/Manifest b/dev-java/jdbm/Manifest
index 259e015ff65e..30b91698f955 100644
--- a/dev-java/jdbm/Manifest
+++ b/dev-java/jdbm/Manifest
@@ -1,4 +1,4 @@
-AUX jdbm-0.12-buildfile.patch 2260 BLAKE2B 8eb654c83944cd2b1ba53d65cd0ba1d99a41e017e18c847b44d0c1775b04138e33de9681e3aa6e178ecb7080c3b857f880720930ee8e8c0ee2ef546814cc5b46 SHA512 22a86d1d647bac6d384fcf69cfb17013396235c113d40c5c38cfa05702ab38e2540d5bd38921d0975f4cac0f22d717b550417569a8dc9a4442abb392e9865565
+AUX jdbm-0.12-buildfile.patch 2267 BLAKE2B 156d36b09fe3aadb1128a7c157e5970d2fe8444978018de933006bd45bb49f941da4946a2b797e8bd20b4d1cb3eb61163936f6c05dbfe9d0a292f8522569bc22 SHA512 b54ff93a3af363efef7495fa32aa5fcc0ba1317d3a65059d9b64147393d2a51f5a344e267ec7b660843b66c0bd0c4cc1bcb5d4c5d3a9e32584e6118ab5470063
 DIST jdbm-0.12-src.zip 969490 BLAKE2B c40ec523c0dfbfe617ffb8b6bb91a1c43cc65d735c9e80970ebfc765c4ef304fa71497670b747c42db55b067a6b0600b184f2ca060089ccfd289849c4f515fc4 SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec
-EBUILD jdbm-0.12-r2.ebuild 879 BLAKE2B ff0b3495b8dd43d2511553dbb144931c21595b08e810c0e4e1ede122dcef2dc2b2e9e98e59421e7422075aeb75ca5fbc6948a14c2790e7603486784b67eb0bbc SHA512 5c825d35e96b4a86322ea751c2300d22f43c5b532305ea410f438f474f43c8eb266aaeb170f5e3c39f7660bee0a3dd7074b4e44c393bd8fc39505773d67e9373
+EBUILD jdbm-0.12-r3.ebuild 846 BLAKE2B c62d5e095bee69120b2e1eac308b6e7d842f818df6e93338b5a0cc3927e4cd4493afc4d90fb8a84bc7d900c2d95519d1ee61c9c41115d9962fdb90ae2037a134 SHA512 33defd875d4e1deebb4c26a0454e6bad2050e38265ba87c14d58eb59edf72ef442d09c8f712c0a74b12a572463a37da5ca58f54f6533d02009efcdb50e267ece
 MISC metadata.xml 310 BLAKE2B 39f67322e71ef31c835b666cf49f3e80d6c16b122d878ac9f19217664f518f69f64cfcd395f5c61512be2e4362117902feb3c661a9596c15c97934e0aee31445 SHA512 2a8c6e7833374873e0087786096a22d53369de951067051786d9d11fb657c8285d1f3dfc1c5b77a12f3172096eef2cfe4129477990806c7f193dad47a068e724
diff --git a/dev-java/jdbm/files/jdbm-0.12-buildfile.patch b/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
index 23957e131c50..0cc6d5e3cc05 100644
--- a/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
+++ b/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2005-02-05 23:34:43.000000000 +0100
-+++ build.xml	2005-02-06 00:02:39.392389088 +0100
+--- a/src/build.xml	2005-02-05 23:34:43.000000000 +0100
++++ b/src/build.xml	2005-02-06 00:02:39.392389088 +0100
 @@ -1,9 +1,9 @@
 -<project name="JDBM" default="main" basedir=".">

 +<project name="JDBM" default="main" basedir="..">

diff --git a/dev-java/jdbm/jdbm-0.12-r2.ebuild b/dev-java/jdbm/jdbm-0.12-r3.ebuild
index 1b4cb774349c..4a625eb0a266 100644
--- a/dev-java/jdbm/jdbm-0.12-r2.ebuild
+++ b/dev-java/jdbm/jdbm-0.12-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,26 +14,25 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 LICENSE="BSD"
 SLOT="1"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 # Needs to depend on 1.3 because this uses assert
 # so we need -source 1.3 here.
-RDEPEND=">=virtual/jre-1.3"
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip"
+RDEPEND="
+	>=virtual/jre-1.3"
 
-src_unpack() {
-	unpack ${A}
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.3"
 
-	cd "${S}/src"
-	epatch "${FILESDIR}/${P}-buildfile.patch"
+PATCHES=( "${FILESDIR}/${P}-buildfile.patch" )
 
-	cd "${S}/lib"
-	rm -v *.jar || die
+src_prepare() {
+	default
+	java-pkg_clean
 }
 
 src_compile() {
-	cd "${S}/src"
+	cd "${S}/src" || die
 	java-pkg-2_src_compile
 }