From 618fa058d8ecdf0bc06da222ca7009245e173f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Sat, 6 Apr 2024 18:00:10 +0200 Subject: [PATCH] dev-lang/clojure: make unslottable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maciej Barć --- ...ojure-1.11.1.ebuild => clojure-1.11.1-r1.ebuild} | 13 +++++-------- ...ojure-1.11.2.ebuild => clojure-1.11.2-r1.ebuild} | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) rename dev-lang/clojure/{clojure-1.11.1.ebuild => clojure-1.11.1-r1.ebuild} (95%) rename dev-lang/clojure/{clojure-1.11.2.ebuild => clojure-1.11.2-r1.ebuild} (97%) diff --git a/dev-lang/clojure/clojure-1.11.1.ebuild b/dev-lang/clojure/clojure-1.11.1-r1.ebuild similarity index 95% rename from dev-lang/clojure/clojure-1.11.1.ebuild rename to dev-lang/clojure/clojure-1.11.1-r1.ebuild index 547ce5a5e5d1c..d95fe4b42eb91 100644 --- a/dev-lang/clojure/clojure-1.11.1.ebuild +++ b/dev-lang/clojure/clojure-1.11.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,20 +32,17 @@ SRC_URI=" https://github.com/clojure/test.check/archive/v${TEST_CHECK_VER}.tar.gz -> test.check-${TEST_CHECK_VER}.tar.gz ) " +S="${WORKDIR}/${PN}-${P}" LICENSE="EPL-1.0 Apache-2.0 BSD" -SLOT="$(ver_cut 1-2)" - +SLOT="0/$(ver_cut 1-2)" KEYWORDS="amd64 x86 ~x86-linux" - -PATCHES=( "${FILESDIR}"/add-compile-spec-ant-build-target.patch ) - RESTRICT="!test? ( test )" RDEPEND=">=virtual/jre-1.8" DEPEND=">=virtual/jdk-1.8" -S="${WORKDIR}"/${PN}-${P} +PATCHES=( "${FILESDIR}"/add-compile-spec-ant-build-target.patch ) DOCS=( changes.md CONTRIBUTING.md readme.txt ) @@ -90,7 +87,7 @@ src_test() { src_install() { java-pkg_newjar "${PN}.jar" - java-pkg_dolauncher ${PN}-${SLOT} --main clojure.main + java-pkg_dolauncher "${PN}" --main clojure.main einstalldocs } diff --git a/dev-lang/clojure/clojure-1.11.2.ebuild b/dev-lang/clojure/clojure-1.11.2-r1.ebuild similarity index 97% rename from dev-lang/clojure/clojure-1.11.2.ebuild rename to dev-lang/clojure/clojure-1.11.2-r1.ebuild index 169b3bad4187f..a0ea1c284db5a 100644 --- a/dev-lang/clojure/clojure-1.11.2.ebuild +++ b/dev-lang/clojure/clojure-1.11.2-r1.ebuild @@ -46,7 +46,7 @@ SRC_URI=" S="${WORKDIR}/${PN}-${P}" LICENSE="EPL-1.0 Apache-2.0 BSD" -SLOT="$(ver_cut 1-2)" +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~amd64 ~x86 ~x86-linux" RESTRICT="!test? ( test )" @@ -102,7 +102,7 @@ src_test() { src_install() { java-pkg_newjar "${PN}.jar" - java-pkg_dolauncher "${PN}-${SLOT}" --main clojure.main + java-pkg_dolauncher "${PN}" --main clojure.main einstalldocs }