summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/clojure/clojure-1.10.0.ebuild')
-rw-r--r--dev-lang/clojure/clojure-1.10.0.ebuild20
1 files changed, 11 insertions, 9 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() {