gentoo resync : 29.01.2021

4 files changed, 24 insertions, 24 deletions

diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index ca3f36339b2d..688c36547ea9 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,7 +1,7 @@
 DIST camlzip-1.06.tar.gz 26499 BLAKE2B a7a1dbe157c0dcb9847bcd6324bbb7cbaf39342d0fdbaed51d2c004ae7b03f8d655fb15da50dae6190b976675e405e28fa2d4fa35a2f4372c50519564d58f981 SHA512 5ef0172927106589620678897f12f054533503a5cf13df71bf4deda43f223d0cd6acce118977e87bce53afe289f367b851f192a8e693274c2bd13549121019dd
 DIST camlzip-1.07.tar.gz 26652 BLAKE2B f373ac0427faa9b6a846e9db8f3e48c00ec6885b8a11cc09fae96b5a7656908f172fda73dbea8ddd1b3dbfd98bcfa3e2e67ce9faf2942d1e260fc0a804813a05 SHA512 b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd
 DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
-EBUILD camlzip-1.06.ebuild 675 BLAKE2B 62844ec59c1659ac216dcca4c53de6dc8a7ae8f9e94e6fca181d4ff5da535548cfb829d86825cc7b6fb55da278eb4e93d1335ff937ef8eb024b3030b14a236db SHA512 936a8828d5ccec18df84be21f2e95cbb8061001d94389fc557b27ce697436b5dbf961b73032b9a416230201b341f48ae5e6b3fe04f172f013a4c60dd449e1375
-EBUILD camlzip-1.07.ebuild 809 BLAKE2B 1862fa6b059b2f557127137998cd7c5c4932240e08c3b7dc961fd7f47520d5fe03a7c65ff9275f8f004aa323828f4539cac35229cafb89f62a6330e9f7f7c266 SHA512 c5ede699cbc018186b9747bc6e24915ce0984a489b38f3fc3e58b001078e5d00ea85689fb231b79b2781de54fd64b8e72692db582651411efb6df989bdace7c3
-EBUILD camlzip-1.10.ebuild 907 BLAKE2B 012df253e5f38bb840c76950f76de430493ae1d2ba91d013ecc7deccda1396844ef453cbd2c013e7718b1e096880f8ac28203bc1d42128f3eaacd94f8b3547dc SHA512 4d349781e882ff21d795f3d676c36b83c5d3667dc4b945f66c5fbcf027b8902c39b9c4c058704ff111076ba170be04eb8af043c43227c37619c465ec9e500748
+EBUILD camlzip-1.06.ebuild 668 BLAKE2B 82f6287580288f3cdeceb91afb7229e150e440d17e78b92ced16f1d8ae26a55c1ed7bcd6d1eb233755104cb26f21b6adfb95c07bec1dbf1dd394f0c3ff208abb SHA512 103fb9d9fd567a07700204489fea658e24f7142b6ba3d497d77623bacfc8b8b388a43f3658a548dcaee781d9218638c0302e0ab06597b15797c8e56fecc735cf
+EBUILD camlzip-1.07.ebuild 740 BLAKE2B b3825484a64ec0e62218ca81723050f0992d6e02683dbced3ba11a5dd5289f74e715a22d62fb440b6da6495de7d5fbd1a21ca8811b07f3925b0c2c75a7ee1928 SHA512 42e72e3edd739f86367f9f35623944bf72a5d812ca9e7efffc94db7d5622eb69a760ba500d0700820ba411079bfe628501c6fd7791442cf69ab3acd29fbccf27
+EBUILD camlzip-1.10.ebuild 906 BLAKE2B 15987bc3e00dacd28b28e07efd38d4bf8211dfa16ddc6c73d99bd877655a3be392cfd008ffa767cfa2ea5f7d22edcc9a7515e57434c91e0f0c4a51c0f78b35e3 SHA512 f91a02f66b3437c51bdd9bdc59f522254217972448a0ea14cf71bc80a998f659b1781bdf8e5562969a4d33039372998cd6985b1f4133877c6d72efeedd8de814
 MISC metadata.xml 316 BLAKE2B 77b2aa09d7f9f4ab39f475277041c53808372951adf605dec9dac4665883c70716fcc18370535027c12581bf8fa7076899fe2d95597d5e5d6b04b5d45a1789e0 SHA512 fa95894f70cbd2fb42e0433a29e675235ed5b68e2bf0095e7fa2fc865f28043fa125c2df5db11b3d8d2998ba71ed60749d302b62917db90747dfa62022553ed2
diff --git a/dev-ml/camlzip/camlzip-1.06.ebuild b/dev-ml/camlzip/camlzip-1.06.ebuild
index 4fed4a00664c..ea2362cc8b90 100644
--- a/dev-ml/camlzip/camlzip-1.06.ebuild
+++ b/dev-ml/camlzip/camlzip-1.06.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit findlib eutils
-
-IUSE="+ocamlopt"
+inherit findlib
 
 DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
 HOMEPAGE="http://forge.ocamlcore.org/projects/camlzip/"
@@ -14,9 +12,12 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1616/${P}.tar.gz"
 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ppc x86"
+IUSE="+ocamlopt"
 
-RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
-		>=sys-libs/zlib-1.1.3"
+RDEPEND="
+	>=dev-lang/ocaml-4.05:=[ocamlopt?]
+	>=sys-libs/zlib-1.1.3
+"
 DEPEND="${RDEPEND}"
 
 src_compile() {
@@ -28,6 +29,7 @@ src_compile() {
 
 src_install() {
 	findlib_src_preinst
+
 	emake DESTDIR="${D}" install-findlib
 
 	dodoc README Changes
diff --git a/dev-ml/camlzip/camlzip-1.07.ebuild b/dev-ml/camlzip/camlzip-1.07.ebuild
index 547fe00d0c83..448875803b1b 100644
--- a/dev-ml/camlzip/camlzip-1.07.ebuild
+++ b/dev-ml/camlzip/camlzip-1.07.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit findlib eutils versionator
-
-IUSE="+ocamlopt"
+inherit findlib
 
 DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
 HOMEPAGE="https://github.com/xavierleroy/camlzip"
-SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(delete_all_version_separators ${PV}).tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
 
 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
-		>=sys-libs/zlib-1.1.3"
+	>=sys-libs/zlib-1.1.3"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-rel$(delete_all_version_separators ${PV})"
-
 src_compile() {
 	emake all
 	if use ocamlopt; then
@@ -30,6 +28,7 @@ src_compile() {
 
 src_install() {
 	findlib_src_preinst
+
 	emake DESTDIR="${D}" install-findlib
 
 	dodoc README Changes
diff --git a/dev-ml/camlzip/camlzip-1.10.ebuild b/dev-ml/camlzip/camlzip-1.10.ebuild
index 181f9c64d19a..244b689e332a 100644
--- a/dev-ml/camlzip/camlzip-1.10.ebuild
+++ b/dev-ml/camlzip/camlzip-1.10.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit findlib
 
-IUSE="+ocamlopt"
-
 DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
 HOMEPAGE="https://github.com/xavierleroy/camlzip"
 SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
 
 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
 		>=sys-libs/zlib-1.1.3"
@@ -24,8 +24,6 @@ QA_FLAGS_IGNORED=(
 	"/usr/lib.*/ocaml/zip/zip.cmxs"
 )
 
-S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
-
 src_compile() {
 	emake all
 	if use ocamlopt; then
@@ -35,6 +33,7 @@ src_compile() {
 
 src_install() {
 	findlib_src_preinst
+
 	emake DESTDIR="${D}" install-findlib
 	dosym zip/libcamlzip.a /usr/$(get_libdir)/ocaml/libcamlzip.a