dev-lang/clojure: >=1.9.0 fix sandbox violations

This commit updates the clojure ebuilds to use the latest ebuild
conventions and updates the dependencies to include two new packages.

This is the last in a series of 3 commits that make it possible to build
>=clojure-1.9.0 on gentoo without pulling in any maven dependencies which
trigger network-sandbox violations.

To accomplish this two new packages dev-java/spec-alpha and
dev-java/core-specs-alpha have been added to the tree. They are
dependencies written in clojure that are required to build clojure but
that do not themselves depend on clojure.

Closes: https://bugs.gentoo.org/670680
Closes: https://bugs.gentoo.org/684536
Closes: https://github.com/gentoo/gentoo/pull/14224

Signed-off-by: Tom Gillespie <tgbugs@gmail.com>
Signed-off-by: Kent Fredric <kentnl@gentoo.org>

2 files changed, 29 insertions, 26 deletions

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
 }