From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40998138350 for ; Thu, 23 Apr 2020 05:19:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 290BDE09F2; Thu, 23 Apr 2020 05:19:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05C96E09F2 for ; Thu, 23 Apr 2020 05:19:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 395BA34F0C1 for ; Thu, 23 Apr 2020 05:19:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D472B1EE for ; Thu, 23 Apr 2020 05:19:14 +0000 (UTC) From: "Kent Fredric" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kent Fredric" Message-ID: <1587618187.421fb65443c227152636a9378dd9963bd65427b0.kentnl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/clojure/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/clojure/clojure-1.10.0.ebuild dev-lang/clojure/clojure-1.9.0-r1.ebuild X-VCS-Directories: dev-lang/clojure/ X-VCS-Committer: kentnl X-VCS-Committer-Name: Kent Fredric X-VCS-Revision: 421fb65443c227152636a9378dd9963bd65427b0 X-VCS-Branch: master Date: Thu, 23 Apr 2020 05:19:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1599e5ca-7ec6-43d9-a4ff-c681feb93d7f X-Archives-Hash: 48bbfc04b9c12990f99834634789efee commit: 421fb65443c227152636a9378dd9963bd65427b0 Author: Tom Gillespie gmail com> AuthorDate: Fri Jan 3 07:41:15 2020 +0000 Commit: Kent Fredric gentoo org> CommitDate: Thu Apr 23 05:03:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=421fb654 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 gmail.com> Signed-off-by: Kent Fredric gentoo.org> dev-lang/clojure/clojure-1.10.0.ebuild | 20 ++++++++++-------- dev-lang/clojure/clojure-1.9.0-r1.ebuild | 35 ++++++++++++++++---------------- 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 1df71774d54..60aef391a05 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 5abaab94b14..25c5659590a 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 }