gentoo resync : 25.04.2020

3 files changed, 31 insertions, 28 deletions

diff --git a/dev-lang/clojure/Manifest b/dev-lang/clojure/Manifest
index a85f7bfdea29..8822600b8ef6 100644
--- a/dev-lang/clojure/Manifest
+++ b/dev-lang/clojure/Manifest
@@ -1,7 +1,7 @@
 DIST clojure-1.10.0.tar.gz 678715 BLAKE2B 8f69a327e94e173864b3d8b81e92ab716c70be9fa59bbd836889cb75a8d44518a3aa2a8fbec50a04f2e7d1afdb07ffef2f7069077e22ef91f321c5fb122d2bb9 SHA512 d53d2322662974d2eed97d7870f0f91822de8acb91e30b50b0dca4186ee667c46b2b5863e080d89e3bfe63d090c6ac2e25617f74d1434bae2ca1e73ae9a36012
 DIST clojure-1.8.0.tar.gz 627688 BLAKE2B 7dc3029e38e574cd32c74cce1f3ae03890869023d5fb2e8138f2fdc4461b3f9e119c4b6042e2b7caee9561b664b49cbaf79378ef1fdd0fd78c4d712c3b9d95de SHA512 fa5714397e679f77260db054bdc0891a311e7bd14bfceb2dd0494480fb9cf21fc74dd295e75070105ff0cdd50842390a748d8782397c549f51d85d18d54a1231
 DIST clojure-1.9.0.tar.gz 641645 BLAKE2B 767241c7f252a2977511adf257b1805f81a96594cff2b1b9837c782cfaabd49ae8e6eef30398e7e277952124e843967ac635985da97e2e7c5cc98ec177f3d79c SHA512 8877c654f6aa8ad990593e69b611388659973e5d1d46cf8f6cfae59c4033424a3c7eebd477539784cbd7974f7ff30580f76d8a4117414491f38e18ac3b4efb27
-EBUILD clojure-1.10.0.ebuild 968 BLAKE2B cd857a4c34c65daeadc8d5a793591c467b259de314ecd54e72bca834abd0644dbea8a0ad1ab383f24631c78c5ef54f3324656b0242c500f137f8e3c4f489a5ac SHA512 34199215a92da5199f1297d17d39a5b123a9f28633b521e076cae8e20ed2f833d3fe9bc88b4ccaaf044f65aa59fd6a5dd6c64c0dcb5bbee8e8a0dd986db7cc6b
+EBUILD clojure-1.10.0.ebuild 1074 BLAKE2B df5abfbf48e516389c03fd3e214516bc3708b31d2fbfce55e1dc14f5e933009dbb7d947ea51244194c9e05a358b738c6e2a995427d5a673692280bfb6a2034b3 SHA512 ee9b624170f4a69221826158a5458cd5a11d329501965b4ba3f6bb4e3c897470e85693f582e2b17af070a276ccf157b8432a3bb9fda77504ce8509b95b95c7c7
 EBUILD clojure-1.8.0.ebuild 779 BLAKE2B d415833f59ac76342dda84f41eab55785639c30f18ac16bf023f535563d6d6ea3b103909624fe907d718d73de94f2b199568faa85140c6239873572ba716c1e6 SHA512 2f7c5c20f310e935de6e00961f14a1cf4ab15b8645cd92fc596595aa343abe24f5979eabe3e2572f5aa0a3834c953d834f76662846686f671200904bce3e9154
-EBUILD clojure-1.9.0-r1.ebuild 1063 BLAKE2B cad11c72f38e52e491f93609e37d57246044612a0a80c21a8cb41d2010e6191dc07a5a197b55f24397188355cf7d0a33215494e16f81681fae326529bfa90f5d SHA512 fddec1f4d3f3ec275dea4bd0187e26bdc0ae447c723a1b0e7b72625b513dd414b5fdde6ba65032da7f1b83886ce10bb58f78232d7cc836024e0b76fb505b888f
+EBUILD clojure-1.9.0-r1.ebuild 1073 BLAKE2B b1a614dbe91ef60efe29e0953ee7c0ac759e8fcf1b7ff155afe57283a0537a6376f13d201b354c2760e3a8291768131a09cd7e7158b3d1a4060af327b7e202e5 SHA512 449b5f10455e76631d0c99970e78c989e4cfe039b72acd86d7a0b51fe83065c8e8bf1cabe98f4efcab0d4e100d2cd297dabaf271ce57c42b44eb73c03bae89e4
 MISC metadata.xml 252 BLAKE2B 738fe12dbc3869c6805e9f90ec607615f0ef13904c794e181e80fca986675cfe884cdbae333fe4837f8bec0f25235ad5d1c223ccd4f01e3355b4f261abe3767c SHA512 471e24b868f43f66916b081b0f2b7995830020f886a33f177a10556a60f824decfe63fc5128e5184b9edc2e157d3f022cb1913303b3cffe4aa9233025843b9dd
diff --git a/dev-lang/clojure/clojure-1.10.0.ebuild b/dev-lang/clojure/clojure-1.10.0.ebuild
index 1df71774d54e..60aef391a050 100644
--- a/dev-lang/clojure/clojure-1.10.0.ebuild
+++ b/dev-lang/clojure/clojure-1.10.0.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="test"
 
 inherit java-pkg-2 java-ant-2
 
+EGIT_REF="76b87a6"
+
 DESCRIPTION="General-purpose programming language with an emphasis on functional programming"
 HOMEPAGE="https://clojure.org/"
-SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
+SRC_URI="https://github.com/clojure/${PN}/archive/${P}.tar.gz"
 
 LICENSE="EPL-1.0 Apache-2.0 BSD"
 SLOT="1.10"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
-RESTRICT="test" # patches welcome to fix the test
+RESTRICT="!test? ( test )" # broken due to file not found issue and more
 
 CDEPEND="
-	dev-java/ant-core:0
-	dev-java/maven-bin:3.6"
+	dev-java/spec-alpha:0.2
+	dev-java/core-specs-alpha:0.2
+	dev-java/ant-core:0"
 
 RDEPEND="
 	${CDEPEND}
@@ -28,13 +31,12 @@ DEPEND="
 	${CDEPEND}
 	>=virtual/jdk-1.8"
 
-S="${WORKDIR}/clojure-clojure-76b87a6"
+S="${WORKDIR}/clojure-${PN}-${EGIT_REF}"
 
 DOCS=( changes.md CONTRIBUTING.md readme.txt )
 
 src_compile() {
-	./antsetup.sh || die "antsetup.sh failed"
-	eant -f build.xml jar
+	eant -Dmaven.compile.classpath=$(java-pkg_getjars core-specs-alpha-0.2,spec-alpha-0.2) -f build.xml jar
 }
 
 src_test() {
diff --git a/dev-lang/clojure/clojure-1.9.0-r1.ebuild b/dev-lang/clojure/clojure-1.9.0-r1.ebuild
index 5abaab94b142..25c5659590a7 100644
--- a/dev-lang/clojure/clojure-1.9.0-r1.ebuild
+++ b/dev-lang/clojure/clojure-1.9.0-r1.ebuild
@@ -1,49 +1,50 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-JAVA_PKG_IUSE="source test"
+JAVA_PKG_IUSE="test"
 
 inherit java-pkg-2 java-ant-2
 
+EGIT_REF="e5a8cfa"
+
 DESCRIPTION="General-purpose programming language with an emphasis on functional programming"
 HOMEPAGE="https://clojure.org/"
-SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
+SRC_URI="https://github.com/clojure/${PN}/archive/${P}.tar.gz"
 
 LICENSE="EPL-1.0 Apache-2.0 BSD"
 SLOT="1.9"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
-RESTRICT="test" # patches welcome to fix the test
+RESTRICT="!test? ( test )" # broken due to file not found issue and more
+
+CDEPEND="
+	dev-java/spec-alpha:0.1
+	dev-java/core-specs-alpha:0.1
+	dev-java/ant-core:0"
 
 RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.8"
 
 DEPEND="
-	>=virtual/jdk-1.8
-	dev-java/ant-core
-	dev-java/maven-bin:3.6"
+	${CDEPEND}
+	>=virtual/jdk-1.8"
 
-S="${WORKDIR}/clojure-clojure-e5a8cfa"
+S="${WORKDIR}/clojure-${PN}-${EGIT_REF}"
 
 DOCS=( changes.md CONTRIBUTING.md readme.txt )
 
 src_compile() {
-	./antsetup.sh || die "antsetup.sh failed"
-	eant local
+	eant -Dmaven.compile.classpath=$(java-pkg_getjars core-specs-alpha-0.1,spec-alpha-0.1) -f build.xml jar
 }
 
 src_test() {
-	java-pkg-2_src_test
+	eant -f build.xml test
 }
 
 src_install() {
 	java-pkg_newjar "${PN}.jar"
 	java-pkg_dolauncher  ${PN}-${SLOT} --main clojure.main
-	if use source; then
-		mv target/${P}-sources.jar ${PN}-sources.jar
-		insinto /usr/share/${PN}-${SLOT}/sources
-		doins ${PN}-sources.jar
-	fi
 	einstalldocs
 }