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

[Sam James]

commit:     2e76cc8b33f566bab28fad6f4efba99b18c03631
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  9 21:38:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <tupone <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> 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"