Hi all,
I have submitted a pull request
(https://github.com/gentoo/gentoo/pull/14224) that allows
dev-lang/clojure-1.9.0 and 1.10.0 to build. Two related bugs are
https://bugs.gentoo.org/670680 and https://bugs.gentoo.org/684536. I
have also attached the changes as patches below. Given that there is
no maintainer for dev-lang/clojure I wondered if someone on this could
take a look. Many thanks!
Tom
From 4d25fead235199b59f42c23ce91b723112e2472d Mon Sep 17 00:00:00 2001
From: Tom Gillespie <tgb...@gmail.com>
Date: Fri, 3 Jan 2020 15:47:57 -0500
Subject: [PATCH 5/5] dev-java/spec-alpha: add metadata.xml
Signed-off-by: Tom Gillespie <tgb...@gmail.com>
---
dev-java/spec-alpha/Manifest | 3 ---
dev-java/spec-alpha/metadata.xml | 8 ++++++++
2 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 dev-java/spec-alpha/metadata.xml
diff --git a/dev-java/spec-alpha/Manifest b/dev-java/spec-alpha/Manifest
index db86db8f403..52d59ab3ee0 100644
--- a/dev-java/spec-alpha/Manifest
+++ b/dev-java/spec-alpha/Manifest
@@ -1,5 +1,2 @@
-AUX build.xml 1401 BLAKE2B 500b8a1de2b452a1198d333366a222e82a8bc78fdc2827d457a50b70d5ffa59866a1f37295a4b275b7ded9bab2a544ee5458b98fba308fb6833816c7567cfc33 SHA512 6d2297aaa240e05688a8062ea02bbb6e488567c00df83d8325c75862240ab109d8c0d9f3779c702161a98ac2f0f684ab87d81c3c0637d73ec382e4e9ca2cf36b
DIST spec.alpha-0.1.143.tar.gz 35568 BLAKE2B f63fdd2b3c83dbd3936e36ff57b6ea399b7173fe805c60a6ecbd8e4aef5942f051a8551c259d89885a202c20045f67921b66c4dc9e361aacc8903c6542d7c7b5 SHA512 87887d72bc7343f96fad937b90feb4cc1be1eeaad8b7c01ae090ebe5cb17c30612e63797ea9eb39e6fe4c07870dcba9e153a98777d372923e95163f3219a976c
DIST spec.alpha-0.2.176.tar.gz 37055 BLAKE2B 0588772e4a47a5b122984abefaf5ef2d0fffbacaf277b22737c94889e646c16a029017d405b72b829e88bcf03b12f689cb2053884b24b47193a26978ab54a318 SHA512 decf0dbff09bf8ee12503e6117ab635b98cd8dd2c389acf7aeebf00f32b5fd8250d66c2ec54cfe5da45e727e39480ae738a3ee7fcad71684d8c3acf464fe21e7
-EBUILD spec-alpha-0.1.143.ebuild 960 BLAKE2B a3534caaf1e4f28a8b892b086c4427f0e6da7dae63232ba7aff769df6737f4fd927b64fd065c92f891267dea0b6eefc46f8ec0c437a0ddd174fd077ecd9bb37f SHA512 b60a477da8e233b8af0b98c83aaa40b8de298e1a4c47385bbab1ea5db1dfb65d6638635deb8a90acd93c41cbf02e0d7954685d0b134114911e8fad3eebe69708
-EBUILD spec-alpha-0.2.176.ebuild 960 BLAKE2B ad2e6b2c8beaed8c22d59ef9665dc78421928447f54118fc97815b0d46c5555d84756267a2b5c58c04ab707715e380f4d1d66c70a3140a1ae602a0248302b920 SHA512 50b2434013d5626b16eb3b8e36e9cac6098373948af406f89ef9143db72689e7d21e482fe1713f5a09fcd084aa9fd65c3c2979772e9f0042afb78dc827b54ba8
diff --git a/dev-java/spec-alpha/metadata.xml b/dev-java/spec-alpha/metadata.xml
new file mode 100644
index 00000000000..aeb8a865b1f
--- /dev/null
+++ b/dev-java/spec-alpha/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">clojure/spec.alpha</remote-id>
+ </upstream>
+</pkgmetadata>
--
2.24.1
From 7fae2d16c41e4d62dd76f958fcd30c78b2ea7fcd Mon Sep 17 00:00:00 2001
From: Tom Gillespie <tgb...@gmail.com>
Date: Fri, 3 Jan 2020 02:39:38 -0500
Subject: [PATCH 1/5] dev-java/spec-alpha: added for clojure build
>=clojure-1.9.0 depends on spec-alpha
includes an ant build.xml file to avoid maven
Signed-off-by: Tom Gillespie <tgb...@gmail.com>
---
dev-java/spec-alpha/Manifest | 5 ++
dev-java/spec-alpha/files/build.xml | 37 +++++++++++++++
dev-java/spec-alpha/spec-alpha-0.1.143.ebuild | 47 +++++++++++++++++++
dev-java/spec-alpha/spec-alpha-0.2.176.ebuild | 47 +++++++++++++++++++
4 files changed, 136 insertions(+)
create mode 100644 dev-java/spec-alpha/Manifest
create mode 100644 dev-java/spec-alpha/files/build.xml
create mode 100644 dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
create mode 100644 dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
diff --git a/dev-java/spec-alpha/Manifest b/dev-java/spec-alpha/Manifest
new file mode 100644
index 00000000000..db86db8f403
--- /dev/null
+++ b/dev-java/spec-alpha/Manifest
@@ -0,0 +1,5 @@
+AUX build.xml 1401 BLAKE2B 500b8a1de2b452a1198d333366a222e82a8bc78fdc2827d457a50b70d5ffa59866a1f37295a4b275b7ded9bab2a544ee5458b98fba308fb6833816c7567cfc33 SHA512 6d2297aaa240e05688a8062ea02bbb6e488567c00df83d8325c75862240ab109d8c0d9f3779c702161a98ac2f0f684ab87d81c3c0637d73ec382e4e9ca2cf36b
+DIST spec.alpha-0.1.143.tar.gz 35568 BLAKE2B f63fdd2b3c83dbd3936e36ff57b6ea399b7173fe805c60a6ecbd8e4aef5942f051a8551c259d89885a202c20045f67921b66c4dc9e361aacc8903c6542d7c7b5 SHA512 87887d72bc7343f96fad937b90feb4cc1be1eeaad8b7c01ae090ebe5cb17c30612e63797ea9eb39e6fe4c07870dcba9e153a98777d372923e95163f3219a976c
+DIST spec.alpha-0.2.176.tar.gz 37055 BLAKE2B 0588772e4a47a5b122984abefaf5ef2d0fffbacaf277b22737c94889e646c16a029017d405b72b829e88bcf03b12f689cb2053884b24b47193a26978ab54a318 SHA512 decf0dbff09bf8ee12503e6117ab635b98cd8dd2c389acf7aeebf00f32b5fd8250d66c2ec54cfe5da45e727e39480ae738a3ee7fcad71684d8c3acf464fe21e7
+EBUILD spec-alpha-0.1.143.ebuild 960 BLAKE2B a3534caaf1e4f28a8b892b086c4427f0e6da7dae63232ba7aff769df6737f4fd927b64fd065c92f891267dea0b6eefc46f8ec0c437a0ddd174fd077ecd9bb37f SHA512 b60a477da8e233b8af0b98c83aaa40b8de298e1a4c47385bbab1ea5db1dfb65d6638635deb8a90acd93c41cbf02e0d7954685d0b134114911e8fad3eebe69708
+EBUILD spec-alpha-0.2.176.ebuild 960 BLAKE2B ad2e6b2c8beaed8c22d59ef9665dc78421928447f54118fc97815b0d46c5555d84756267a2b5c58c04ab707715e380f4d1d66c70a3140a1ae602a0248302b920 SHA512 50b2434013d5626b16eb3b8e36e9cac6098373948af406f89ef9143db72689e7d21e482fe1713f5a09fcd084aa9fd65c3c2979772e9f0042afb78dc827b54ba8
diff --git a/dev-java/spec-alpha/files/build.xml b/dev-java/spec-alpha/files/build.xml
new file mode 100644
index 00000000000..cb2de405c02
--- /dev/null
+++ b/dev-java/spec-alpha/files/build.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
+<!-- ====================================================================== -->
+
+<project name="spec.alpha" default="package" basedir=".">
+ <property name="maven.build.finalName" value="spec.alpha-SNAPSHOT"/>
+ <property name="maven.build.dir" value="target"/>
+ <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+ <property name="maven.build.srcDir.0" value="src/main/clojure"/>
+
+ <!-- clean -->
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${maven.build.dir}"/>
+ </target>
+
+ <!-- build -->
+ <target name="build" description="Copy the files">
+ <mkdir dir="${maven.build.outputDir}"/>
+ <copy todir="${maven.build.outputDir}">
+ <fileset dir="${maven.build.srcDir.0}"/>
+ </copy>
+ </target>
+
+ <!-- package -->
+ <target name="package" depends="build" description="Package the application">
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html"/>
+ </target>
+
+ <!-- jar -->
+ <target name="jar" depends="package" description="Builds the jar for the application"/>
+</project>
diff --git a/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild b/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
new file mode 100644
index 00000000000..cd4c3c35665
--- /dev/null
+++ b/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+EGIT_REF="51b64c0"
+
+MY_PN=${PN//-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Clojure library to describe the structure of data and functions."
+HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha";
+SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz";
+
+LICENSE="EPL-1.0"
+SLOT="0.1"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE=""
+RESTRICT="test" # patches welcome to fix the test
+
+CDEPEND="dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+EANT_TASKS="jar"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
+
+src_prepare() {
+ default
+ cp ${FILESDIR}/build.xml ${S}
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "${S}/target/${MY_P}.jar"
+ dodoc CONTRIBUTING.md README.md
+}
diff --git a/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild b/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
new file mode 100644
index 00000000000..c3189b34efe
--- /dev/null
+++ b/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+EGIT_REF="59af4cf"
+
+MY_PN=${PN//-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Clojure library to describe the structure of data and functions."
+HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha";
+SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz";
+
+LICENSE="EPL-1.0"
+SLOT="0.2"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE=""
+RESTRICT="test" # patches welcome to fix the test
+
+CDEPEND="dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+EANT_TASKS="jar"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
+
+src_prepare() {
+ default
+ cp ${FILESDIR}/build.xml ${S}
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "${S}/target/${MY_P}.jar"
+ dodoc CONTRIBUTING.md README.md
+}
--
2.24.1
From 6262b6e5071a67a634ad18eaa9bac6d93db7bf99 Mon Sep 17 00:00:00 2001
From: Tom Gillespie <tgb...@gmail.com>
Date: Fri, 3 Jan 2020 15:44:41 -0500
Subject: [PATCH 4/5] dev-java/core-specs-alpha: add metadata.xml
Signed-off-by: Tom Gillespie <tgb...@gmail.com>
---
dev-java/core-specs-alpha/Manifest | 3 ---
dev-java/core-specs-alpha/metadata.xml | 8 ++++++++
2 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 dev-java/core-specs-alpha/metadata.xml
diff --git a/dev-java/core-specs-alpha/Manifest b/dev-java/core-specs-alpha/Manifest
index a7bbb8a3ff5..0ea8b8c3c1e 100644
--- a/dev-java/core-specs-alpha/Manifest
+++ b/dev-java/core-specs-alpha/Manifest
@@ -1,5 +1,2 @@
-AUX build.xml 1407 BLAKE2B 602878c4ac8de3cd1ec9afc291a69def14cfcadfc9554ead5c7e56d650a720cfdd7ae3190d23ba1683e1b5d29d95d95738f299aa613ed1a7826283cce029f0c0 SHA512 a19802e1b32f7229b769f31d4453ef58db59824f3f7950dd3032d93feeff88a89b16d5cbf3b98028841dcf0a43b1224ffe6a7d4ca63692ed2b3f8568a824979a
DIST core.specs.alpha-0.1.24.tar.gz 9896 BLAKE2B cb06053d2aa77b4bbd58b612fb0f80137833e156a5136e4f53f6123d158bdbe676e9bacdfe76728b1320986589e8242c52f49a4d8922bda5374e34fe52969ddc SHA512 6ddf20bf9be36f7493104f69f4e9402fc62f49005471a967843c7cfee898c67aaf5046886db73e6b54942538beed9556d83f4582e85fd02ef4cb755cb5a18d34
DIST core.specs.alpha-0.2.44.tar.gz 10163 BLAKE2B c81ebb08779c3db137363ffb12bc7e26d29cd67323c98430a033f639714da83bf8c9d14146c12d925094e057d3735d100e33656e9571a0a4c107dc9fb56359e9 SHA512 1a59b947c580e45a280b25d5827a174565e066dde577685ca86aa1bbd9767716991cefb8a944c7ded0f84a71f9902f7fcdb5baacc7e19180096d599a51083048
-EBUILD core-specs-alpha-0.1.24.ebuild 975 BLAKE2B 7eb80809d67abd093691fec560524431161eecb0ad3e70077e45f4a539213b43400f6ae210fa46b34cb386149c8947a69033dda1381b364b755b050f085e23aa SHA512 3c4aba0a2f0dffac04c762ac5423c4feac272c762201bbebf0c6602fd4207edaf102a4ed635c535d8925de6296d07a2278b9261683d2768c250649090479e321
-EBUILD core-specs-alpha-0.2.44.ebuild 975 BLAKE2B 4768b424b237666a765d79ba0775d40676e112ef83e481660d4dfaefb4436067a0b724bd3b4de10cbbcfa1fd5dee893b790b3f31a40fe896b63ca60091987401 SHA512 f77a8cee66a8078f888c4eb6fe8dd2f24b96724f35181a7b364af978fe87632e5d8c6a50fdaee9a077c6fb7656f6783870913fadf74a4cb7eed71972e6e8717a
diff --git a/dev-java/core-specs-alpha/metadata.xml b/dev-java/core-specs-alpha/metadata.xml
new file mode 100644
index 00000000000..c90820a9217
--- /dev/null
+++ b/dev-java/core-specs-alpha/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">clojure/core.specs.alpha</remote-id>
+ </upstream>
+</pkgmetadata>
--
2.24.1
From 7f68d5ed31ab95c805ce704940b434bfd31bfb66 Mon Sep 17 00:00:00 2001
From: Tom Gillespie <tgb...@gmail.com>
Date: Fri, 3 Jan 2020 02:40:25 -0500
Subject: [PATCH 2/5] dev-java/core-specs-alpha: added for clojure build
>=clojure-1.9.0 depends on core-specs-alpha
includes an ant build.xml file to avoid maven
Signed-off-by: Tom Gillespie <tgb...@gmail.com>
---
dev-java/core-specs-alpha/Manifest | 5 ++
.../core-specs-alpha-0.1.24.ebuild | 47 +++++++++++++++++++
.../core-specs-alpha-0.2.44.ebuild | 47 +++++++++++++++++++
dev-java/core-specs-alpha/files/build.xml | 37 +++++++++++++++
4 files changed, 136 insertions(+)
create mode 100644 dev-java/core-specs-alpha/Manifest
create mode 100644 dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
create mode 100644 dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
create mode 100644 dev-java/core-specs-alpha/files/build.xml
diff --git a/dev-java/core-specs-alpha/Manifest b/dev-java/core-specs-alpha/Manifest
new file mode 100644
index 00000000000..a7bbb8a3ff5
--- /dev/null
+++ b/dev-java/core-specs-alpha/Manifest
@@ -0,0 +1,5 @@
+AUX build.xml 1407 BLAKE2B 602878c4ac8de3cd1ec9afc291a69def14cfcadfc9554ead5c7e56d650a720cfdd7ae3190d23ba1683e1b5d29d95d95738f299aa613ed1a7826283cce029f0c0 SHA512 a19802e1b32f7229b769f31d4453ef58db59824f3f7950dd3032d93feeff88a89b16d5cbf3b98028841dcf0a43b1224ffe6a7d4ca63692ed2b3f8568a824979a
+DIST core.specs.alpha-0.1.24.tar.gz 9896 BLAKE2B cb06053d2aa77b4bbd58b612fb0f80137833e156a5136e4f53f6123d158bdbe676e9bacdfe76728b1320986589e8242c52f49a4d8922bda5374e34fe52969ddc SHA512 6ddf20bf9be36f7493104f69f4e9402fc62f49005471a967843c7cfee898c67aaf5046886db73e6b54942538beed9556d83f4582e85fd02ef4cb755cb5a18d34
+DIST core.specs.alpha-0.2.44.tar.gz 10163 BLAKE2B c81ebb08779c3db137363ffb12bc7e26d29cd67323c98430a033f639714da83bf8c9d14146c12d925094e057d3735d100e33656e9571a0a4c107dc9fb56359e9 SHA512 1a59b947c580e45a280b25d5827a174565e066dde577685ca86aa1bbd9767716991cefb8a944c7ded0f84a71f9902f7fcdb5baacc7e19180096d599a51083048
+EBUILD core-specs-alpha-0.1.24.ebuild 975 BLAKE2B 7eb80809d67abd093691fec560524431161eecb0ad3e70077e45f4a539213b43400f6ae210fa46b34cb386149c8947a69033dda1381b364b755b050f085e23aa SHA512 3c4aba0a2f0dffac04c762ac5423c4feac272c762201bbebf0c6602fd4207edaf102a4ed635c535d8925de6296d07a2278b9261683d2768c250649090479e321
+EBUILD core-specs-alpha-0.2.44.ebuild 975 BLAKE2B 4768b424b237666a765d79ba0775d40676e112ef83e481660d4dfaefb4436067a0b724bd3b4de10cbbcfa1fd5dee893b790b3f31a40fe896b63ca60091987401 SHA512 f77a8cee66a8078f888c4eb6fe8dd2f24b96724f35181a7b364af978fe87632e5d8c6a50fdaee9a077c6fb7656f6783870913fadf74a4cb7eed71972e6e8717a
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
new file mode 100644
index 00000000000..4c432b9a2e0
--- /dev/null
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+EGIT_REF="43815fc"
+
+MY_PN=${PN//-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions."
+HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha";
+SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz";
+
+LICENSE="EPL-1.0"
+SLOT="0.1"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE=""
+RESTRICT="test" # patches welcome to fix the test
+
+CDEPEND="dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+EANT_TASKS="jar"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
+
+src_prepare() {
+ default
+ cp ${FILESDIR}/build.xml ${S}
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "${S}/target/${MY_P}.jar"
+ dodoc CONTRIBUTING.md README.md
+}
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
new file mode 100644
index 00000000000..bc3d3ad5a58
--- /dev/null
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+EGIT_REF="d69f559"
+
+MY_PN=${PN//-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions."
+HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha";
+SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz";
+
+LICENSE="EPL-1.0"
+SLOT="0.2"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE=""
+RESTRICT="test" # patches welcome to fix the test
+
+CDEPEND="dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+EANT_TASKS="jar"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
+
+src_prepare() {
+ default
+ cp ${FILESDIR}/build.xml ${S}
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "${S}/target/${MY_P}.jar"
+ dodoc CONTRIBUTING.md README.md
+}
diff --git a/dev-java/core-specs-alpha/files/build.xml b/dev-java/core-specs-alpha/files/build.xml
new file mode 100644
index 00000000000..bed876cd81b
--- /dev/null
+++ b/dev-java/core-specs-alpha/files/build.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
+<!-- ====================================================================== -->
+
+<project name="spec.alpha" default="package" basedir=".">
+ <property name="maven.build.finalName" value="core.specs.alpha-SNAPSHOT"/>
+ <property name="maven.build.dir" value="target"/>
+ <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+ <property name="maven.build.srcDir.0" value="src/main/clojure"/>
+
+ <!-- clean -->
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${maven.build.dir}"/>
+ </target>
+
+ <!-- build -->
+ <target name="build" description="Copy the files">
+ <mkdir dir="${maven.build.outputDir}"/>
+ <copy todir="${maven.build.outputDir}">
+ <fileset dir="${maven.build.srcDir.0}"/>
+ </copy>
+ </target>
+
+ <!-- package -->
+ <target name="package" depends="build" description="Package the application">
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html"/>
+ </target>
+
+ <!-- jar -->
+ <target name="jar" depends="package" description="Builds the jar for the application"/>
+</project>
--
2.24.1
From 12d655fdd50b38864fee6f8872e68c3a1a1224db Mon Sep 17 00:00:00 2001
From: Tom Gillespie <tgb...@gmail.com>
Date: Fri, 3 Jan 2020 02:41:15 -0500
Subject: [PATCH 3/5] dev-lang/clojure: fix sandbox violations
Closes: https://bugs.gentoo.org/684536
Signed-off-by: Tom Gillespie <tgb...@gmail.com>
---
dev-lang/clojure/clojure-1.10.0.ebuild | 18 +++++++------
dev-lang/clojure/clojure-1.9.0-r1.ebuild | 33 ++++++++++++------------
2 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/dev-lang/clojure/clojure-1.10.0.ebuild b/dev-lang/clojure/clojure-1.10.0.ebuild
index 1df71774d54..9749b952690 100644
--- a/dev-lang/clojure/clojure-1.10.0.ebuild
+++ b/dev-lang/clojure/clojure-1.10.0.ebuild
@@ -1,15 +1,17 @@
-# 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"
@@ -17,8 +19,9 @@ KEYWORDS="~amd64 ~x86 ~x86-linux"
RESTRICT="test" # patches welcome to fix the test
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 5abaab94b14..2a87a65dc79 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
+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
}
--
2.24.1
