[gentoo-commits] repo/gentoo:master commit in: dev-lang/clojure/

[Maciej Barć]

commit:     618fa058d8ecdf0bc06da222ca7009245e173f88
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 16:00:10 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 16:27:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618fa058

dev-lang/clojure: make unslottable

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../{clojure-1.11.1.ebuild => clojure-1.11.1-r1.ebuild}     | 13 +++++--------
 .../{clojure-1.11.2.ebuild => clojure-1.11.2-r1.ebuild}     |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

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 547ce5a5e5d1..d95fe4b42eb9 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 169b3bad4187..a0ea1c284db5 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
 }