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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7774158041 for ; Sat, 6 Apr 2024 16:27:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AE9AE2A22; Sat, 6 Apr 2024 16:27:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EFC3E2A22 for ; Sat, 6 Apr 2024 16:27:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74CE7343292 for ; Sat, 6 Apr 2024 16:27:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8909315C7 for ; Sat, 6 Apr 2024 16:27:17 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1712420835.618fa058d8ecdf0bc06da222ca7009245e173f88.xgqt@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.11.1-r1.ebuild dev-lang/clojure/clojure-1.11.1.ebuild dev-lang/clojure/clojure-1.11.2-r1.ebuild dev-lang/clojure/clojure-1.11.2.ebuild X-VCS-Directories: dev-lang/clojure/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 618fa058d8ecdf0bc06da222ca7009245e173f88 X-VCS-Branch: master Date: Sat, 6 Apr 2024 16:27:17 +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: 1c56d799-333e-445e-8172-d6a0ed053820 X-Archives-Hash: d4ee3342c94b1a61ce49775f71535f48 commit: 618fa058d8ecdf0bc06da222ca7009245e173f88 Author: Maciej Barć gentoo org> AuthorDate: Sat Apr 6 16:00:10 2024 +0000 Commit: Maciej Barć gentoo 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ć 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 }