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 9E5EC1382C5 for ; Wed, 9 Jun 2021 21:45:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF490E0391; Wed, 9 Jun 2021 21:45:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A0379E0391 for ; Wed, 9 Jun 2021 21:45:30 +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 D2DFC335D6E for ; Wed, 9 Jun 2021 21:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E3207A4 for ; Wed, 9 Jun 2021 21:45:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1623274716.2e76cc8b33f566bab28fad6f4efba99b18c03631.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ocaml/ocaml-4.05.0-r3.ebuild dev-lang/ocaml/ocaml-4.05.0-r4.ebuild dev-lang/ocaml/ocaml-4.05.0-r5.ebuild dev-lang/ocaml/ocaml-4.05.0-r6.ebuild dev-lang/ocaml/ocaml-4.09.0-r1.ebuild dev-lang/ocaml/ocaml-4.09.0.ebuild dev-lang/ocaml/ocaml-4.10.2-r1.ebuild dev-lang/ocaml/ocaml-4.10.2.ebuild dev-lang/ocaml/ocaml-4.11.2-r1.ebuild dev-lang/ocaml/ocaml-4.11.2.ebuild dev-lang/ocaml/ocaml-4.12.0-r1.ebuild dev-lang/ocaml/ocaml-4.12.0.ebuild X-VCS-Directories: dev-lang/ocaml/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2e76cc8b33f566bab28fad6f4efba99b18c03631 X-VCS-Branch: master Date: Wed, 9 Jun 2021 21:45:27 +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: 19388bee-5480-488c-b39f-32ba6a55aef9 X-Archives-Hash: af6d3e48d56fbf50b55d317df1186073 commit: 2e76cc8b33f566bab28fad6f4efba99b18c03631 Author: Sam James gentoo org> AuthorDate: Wed Jun 9 21:38:36 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 9 21:38:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e76cc8b dev-lang/ocaml: adjust subslot to be major version Should be bytecode compatible with non-major version changes. Makes it a lot easier to give dependencies in e.g. camlp4 which needs to be exactly aligned with the OCaml major version. Bug: https://bugs.gentoo.org/794898 Acked-by: Alfredo Tupone gentoo.org> Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/{ocaml-4.05.0-r3.ebuild => ocaml-4.05.0-r5.ebuild} | 2 +- dev-lang/ocaml/{ocaml-4.05.0-r4.ebuild => ocaml-4.05.0-r6.ebuild} | 2 +- dev-lang/ocaml/{ocaml-4.09.0.ebuild => ocaml-4.09.0-r1.ebuild} | 2 +- dev-lang/ocaml/{ocaml-4.10.2.ebuild => ocaml-4.10.2-r1.ebuild} | 2 +- dev-lang/ocaml/{ocaml-4.11.2.ebuild => ocaml-4.11.2-r1.ebuild} | 2 +- dev-lang/ocaml/{ocaml-4.12.0.ebuild => ocaml-4.12.0-r1.ebuild} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild similarity index 99% rename from dev-lang/ocaml/ocaml-4.05.0-r3.ebuild rename to dev-lang/ocaml/ocaml-4.05.0-r5.ebuild index 69094b6cb10..36adb282101 100644 --- a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild +++ b/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar. LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. -SLOT="0/${PV}" +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs" diff --git a/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild similarity index 99% rename from dev-lang/ocaml/ocaml-4.05.0-r4.ebuild rename to dev-lang/ocaml/ocaml-4.05.0-r6.ebuild index 1fd3049eff5..ae3120cad72 100644 --- a/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild +++ b/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar. LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. -SLOT="0/${PV}" +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs" diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild b/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild similarity index 99% rename from dev-lang/ocaml/ocaml-4.09.0.ebuild rename to dev-lang/ocaml/ocaml-4.09.0-r1.ebuild index f74988668b8..14dc7a908b0 100644 --- a/dev-lang/ocaml/ocaml-4.09.0.ebuild +++ b/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles" LICENSE="LGPL-2.1" -SLOT="0/${PV}" +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt spacetime xemacs" diff --git a/dev-lang/ocaml/ocaml-4.10.2.ebuild b/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild similarity index 99% rename from dev-lang/ocaml/ocaml-4.10.2.ebuild rename to dev-lang/ocaml/ocaml-4.10.2-r1.ebuild index 208d8612d6a..e1ca18aa961 100644 --- a/dev-lang/ocaml/ocaml-4.10.2.ebuild +++ b/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles" LICENSE="LGPL-2.1" -SLOT="0/${PV}" +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt spacetime xemacs" diff --git a/dev-lang/ocaml/ocaml-4.11.2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild similarity index 98% rename from dev-lang/ocaml/ocaml-4.11.2.ebuild rename to dev-lang/ocaml/ocaml-4.11.2-r1.ebuild index e3298bdfc89..f1ad43dbf99 100644 --- a/dev-lang/ocaml/ocaml-4.11.2.ebuild +++ b/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles" LICENSE="QPL-1.0 LGPL-2" -SLOT="0/${PV}" +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt spacetime xemacs" diff --git a/dev-lang/ocaml/ocaml-4.12.0.ebuild b/dev-lang/ocaml/ocaml-4.12.0-r1.ebuild similarity index 98% rename from dev-lang/ocaml/ocaml-4.12.0.ebuild rename to dev-lang/ocaml/ocaml-4.12.0-r1.ebuild index b045e3d1153..137a6160e45 100644 --- a/dev-lang/ocaml/ocaml-4.12.0.ebuild +++ b/dev-lang/ocaml/ocaml-4.12.0-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles" LICENSE="QPL-1.0 LGPL-2" -SLOT="0/${PV}" +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt xemacs"