gentoo (leap year) resync : 29.02.2020

7 files changed, 3 insertions, 337 deletions

diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 2637aaa4f23e..d036a281a2bd 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -1,13 +1,3 @@
-DIST camlp5-6.17.tar.gz 718935 BLAKE2B b0a573e1110d6ce0654325a1a7310ebee8c815998df3f1a2bec514a4c4755dedfe68349a55dd227c97a667dbbf36c3d896bd17400e32b0f05e3e9801142aa204 SHA512 c4bf32eb79202d6127375b940fe77fc57c7dc5f8c6763b50ba23ab52ae9f3edb0ba15148109af2f6f4808619348d78e927cfdf29901bf1141b17de0d3fd8ff30
-DIST camlp5-7.00.tar.gz 755750 BLAKE2B b047422ff34c4d15c21b65bd7473ccdad8bfc1f484a0075f1beeaa50fdca72b2f900b437333c847a4e4fd7bb8ae5c37aa4ed984e3a850c4dcba045d8678502c4 SHA512 2d63451229f86fffeb287735ed26901ad43bb964b6ede1716cb82737001a5c1e4b77479a969509606f6a4f14bb6dbff32275d82f4a9640e0c16bb6594779e849
-DIST camlp5-7.01.tar.gz 757118 BLAKE2B 5d7c6f39f24bfee545552aae5c126305d2c767d06762aa516c21bcc5b327b312b7c38d742717eb507b92ae1e27de9c0fcde4d616754a7ce616b5f56689c8dc5a SHA512 9930957f707d9d2c8903f87f5f3444f71bad3d84c944436c7abc6de19209595c974098cd60a6a391f8ae87c4fb53b5122cba8e42e34fcf46d798dbdc28840008
-DIST camlp5-7.03.tar.gz 758136 BLAKE2B 4e1169adf7e119f1f659fe684a8b06c4730db3bcd7807169552de0e3fc115f8d45bc11961f3aee0a9c2d86e1130ec776a1bb7753d7d4e95f661d65d1f841406c SHA512 0c76d469c5f8c727088f3136107b6690349b50791ef8baefffdaa90141230907f977a7a886a9e8d88d39d8fa315637d882d0205c57d752e16575c888a8a1f54d
-DIST camlp5-7.10.tar.gz 849559 BLAKE2B b05624156e914c2657d76afbf3dfacd295fe5985ae3809959a40029a8052669be6ae8a6ff889fbf2c602d3f19c9995f013b388c140738f4bb4f4da9970911ed5 SHA512 faa9e88f56477162038fc80429d5839c93b3e38aec90366730babe737e2e6bb260dc39975947a6601212cc0c68f465bdbccb6337da23c07181909dfb11cf8640
 DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159
-EBUILD camlp5-6.17.ebuild 1667 BLAKE2B 1a697733022a5ba44310108cad0418de1b856575f2ba2e18cb449c026507b796e737a0b3988936231271de307fb61ebcd655d930afd739191989c8a346cf6874 SHA512 adbe95ff3504175b62a65bc609d0dbefa2a1f8755ca33aa61465b3b7e0be50355e916c94ca406d4223027c0e5e624518f8144af1ea4d944c6de95899f954bd8f
-EBUILD camlp5-7.00.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
-EBUILD camlp5-7.01.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
-EBUILD camlp5-7.03.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
-EBUILD camlp5-7.10.ebuild 949 BLAKE2B 810503c75e88dc9f3977b9a0abc792550da30c35c75f4e12e8db6e9a90a1d3e3633de5d5b5ad0a44f94ec6483b40ee3306bdf5ffcfb699d82f5bb2d9d0f1a3fe SHA512 79e382b13c34f552875ae9bc5e6c8ccdcc5724c37702b95b5e9af7b900e6766188946861031f95a7183e4d758e45b3dcd5ec9db5fcd3e06440d4c48b59be9d26
-EBUILD camlp5-7.11.ebuild 943 BLAKE2B 402d36749069983687d813ccdfeffc13b6ad90813db363d85024d8d68b2606cafdcb74ced4ddd526ae8cb0fc3f266572efe01d33f071a402e15ec57f050169d1 SHA512 5ee48affda4c799567189842f8278864a29b90f0b6187e4e4233f36bd76e5376181cd149674bd3e19ff532a4b13ce198dfef86cec78175d9dd994e84015f96c9
+EBUILD camlp5-7.11.ebuild 941 BLAKE2B da669d9224d324e569eed611c48d6deb24cc1666f2fa25e79abe85d5e82b25d9c1bf3050f556e5c81e9f4eea64ecbcb238935a5e207e15f2b133ea56cd6b8770 SHA512 c89294930ad1b92cb3b687949ea3841cec547acc671973e19e1de1c1569d99af4d2f052adef926e7bb20d378999cc6f7596ac3a7cc240b1d1dfd4458626cf21e
 MISC metadata.xml 325 BLAKE2B e1e22f9260b70f58e523e16ba3f5a9fd8b58050ed7ba2107af06db261129f190620aee89c824557af3f5724b4f78ee5b4899addeee6fc9572315a2640f9d666d SHA512 52021194baa57054aaaad66864a51fd2bdf9c161e32fe78dcb1541480cfa03780645e3c1bb64271ce21015af26f2362fcb620c44c80253db82e06e1d38ed95b9
diff --git a/dev-ml/camlp5/camlp5-6.17.ebuild b/dev-ml/camlp5/camlp5-6.17.ebuild
deleted file mode 100644
index f8ae1a8ac72c..000000000000
--- a/dev-ml/camlp5/camlp5-6.17.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib findlib eutils versionator
-
-MY_P=${P%_p*}
-DESCRIPTION="A preprocessor-pretty-printer of ocaml"
-HOMEPAGE="https://camlp5.github.io/"
-SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE="doc +ocamlopt"
-
-DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
-	<=dev-lang/ocaml-4.4.2
-"
-RDEPEND="${DEPEND}"
-
-PATCHLEVEL=${PV#*_p}
-PATCHLIST=""
-
-if [ "${PATCHLEVEL}" != "${PV}" ] ; then
-	for (( i=1; i<=PATCHLEVEL; i++ )) ; do
-		SRC_URI="${SRC_URI}
-			http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
-		PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
-	done
-fi
-
-src_prepare() {
-	for i in ${PATCHLIST} ; do
-		epatch "${DISTDIR}/${i}"
-	done
-	# ocaml 4.04.2 support
-	cp -a ocaml_stuff/4.04.1 ocaml_stuff/4.04.2 || die
-	cp ocaml_src/lib/versdep/4.04.{1,2}.ml || die
-	sed -i -e 's/4.04.1/4.04.2/'  ocaml_stuff/4.04.2/utils/pconfig.ml || die
-}
-
-src_configure() {
-	./configure \
-		--strict \
-		-prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/$(get_libdir)/ocaml \
-		-mandir /usr/share/man || die "configure failed"
-}
-
-src_compile(){
-	emake out
-	if use ocamlopt; then
-		emake  opt
-		emake  opt.opt
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# findlib support
-	insinto "$(ocamlfind printconf destdir)/${PN}"
-	doins etc/META
-
-	use doc && dohtml -r doc/*
-
-	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
-}
diff --git a/dev-ml/camlp5/camlp5-7.00.ebuild b/dev-ml/camlp5/camlp5-7.00.ebuild
deleted file mode 100644
index 2ead52bac719..000000000000
--- a/dev-ml/camlp5/camlp5-7.00.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib findlib eutils versionator
-
-MY_P=${P%_p*}
-DESCRIPTION="A preprocessor-pretty-printer of ocaml"
-HOMEPAGE="https://camlp5.github.io/"
-SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="doc +ocamlopt"
-
-DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
-	<=dev-lang/ocaml-4.6.0
-"
-RDEPEND="${DEPEND}"
-
-PATCHLEVEL=${PV#*_p}
-PATCHLIST=""
-
-if [ "${PATCHLEVEL}" != "${PV}" ] ; then
-	for (( i=1; i<=PATCHLEVEL; i++ )) ; do
-		SRC_URI="${SRC_URI}
-			http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
-		PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
-	done
-fi
-
-src_prepare() {
-	for i in ${PATCHLIST} ; do
-		epatch "${DISTDIR}/${i}"
-	done
-}
-
-src_configure() {
-	./configure \
-		--strict \
-		-prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/$(get_libdir)/ocaml \
-		-mandir /usr/share/man || die "configure failed"
-}
-
-src_compile(){
-	emake out
-	if use ocamlopt; then
-		emake  opt
-		emake  opt.opt
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# findlib support
-	insinto "$(ocamlfind printconf destdir)/${PN}"
-	doins etc/META
-
-	use doc && dohtml -r doc/*
-
-	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
-}
diff --git a/dev-ml/camlp5/camlp5-7.01.ebuild b/dev-ml/camlp5/camlp5-7.01.ebuild
deleted file mode 100644
index 2ead52bac719..000000000000
--- a/dev-ml/camlp5/camlp5-7.01.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib findlib eutils versionator
-
-MY_P=${P%_p*}
-DESCRIPTION="A preprocessor-pretty-printer of ocaml"
-HOMEPAGE="https://camlp5.github.io/"
-SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="doc +ocamlopt"
-
-DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
-	<=dev-lang/ocaml-4.6.0
-"
-RDEPEND="${DEPEND}"
-
-PATCHLEVEL=${PV#*_p}
-PATCHLIST=""
-
-if [ "${PATCHLEVEL}" != "${PV}" ] ; then
-	for (( i=1; i<=PATCHLEVEL; i++ )) ; do
-		SRC_URI="${SRC_URI}
-			http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
-		PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
-	done
-fi
-
-src_prepare() {
-	for i in ${PATCHLIST} ; do
-		epatch "${DISTDIR}/${i}"
-	done
-}
-
-src_configure() {
-	./configure \
-		--strict \
-		-prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/$(get_libdir)/ocaml \
-		-mandir /usr/share/man || die "configure failed"
-}
-
-src_compile(){
-	emake out
-	if use ocamlopt; then
-		emake  opt
-		emake  opt.opt
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# findlib support
-	insinto "$(ocamlfind printconf destdir)/${PN}"
-	doins etc/META
-
-	use doc && dohtml -r doc/*
-
-	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
-}
diff --git a/dev-ml/camlp5/camlp5-7.03.ebuild b/dev-ml/camlp5/camlp5-7.03.ebuild
deleted file mode 100644
index 2ead52bac719..000000000000
--- a/dev-ml/camlp5/camlp5-7.03.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib findlib eutils versionator
-
-MY_P=${P%_p*}
-DESCRIPTION="A preprocessor-pretty-printer of ocaml"
-HOMEPAGE="https://camlp5.github.io/"
-SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="doc +ocamlopt"
-
-DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
-	<=dev-lang/ocaml-4.6.0
-"
-RDEPEND="${DEPEND}"
-
-PATCHLEVEL=${PV#*_p}
-PATCHLIST=""
-
-if [ "${PATCHLEVEL}" != "${PV}" ] ; then
-	for (( i=1; i<=PATCHLEVEL; i++ )) ; do
-		SRC_URI="${SRC_URI}
-			http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
-		PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
-	done
-fi
-
-src_prepare() {
-	for i in ${PATCHLIST} ; do
-		epatch "${DISTDIR}/${i}"
-	done
-}
-
-src_configure() {
-	./configure \
-		--strict \
-		-prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/$(get_libdir)/ocaml \
-		-mandir /usr/share/man || die "configure failed"
-}
-
-src_compile(){
-	emake out
-	if use ocamlopt; then
-		emake  opt
-		emake  opt.opt
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# findlib support
-	insinto "$(ocamlfind printconf destdir)/${PN}"
-	doins etc/META
-
-	use doc && dohtml -r doc/*
-
-	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
-}
diff --git a/dev-ml/camlp5/camlp5-7.10.ebuild b/dev-ml/camlp5/camlp5-7.10.ebuild
deleted file mode 100644
index 5d5237a3aebf..000000000000
--- a/dev-ml/camlp5/camlp5-7.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="A preprocessor-pretty-printer of ocaml"
-HOMEPAGE="https://camlp5.github.io/"
-SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="doc +ocamlopt"
-
-DEPEND="<dev-lang/ocaml-4.09"
-RDEPEND="${DEPEND}"
-
-DOCS="CHANGES DEVEL ICHANGES README.md UPGRADING MODE"
-
-src_configure() {
-	./configure \
-		--strict \
-		-prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/$(get_libdir)/ocaml \
-		-mandir /usr/share/man || die "configure failed"
-}
-
-src_compile(){
-	emake out
-	if use ocamlopt; then
-		emake  opt
-		emake  opt.opt
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS="doc/*"
-
-	default
-
-	# findlib support
-	insinto "$(ocamlfind printconf destdir)/${PN}"
-	doins etc/META
-}
diff --git a/dev-ml/camlp5/camlp5-7.11.ebuild b/dev-ml/camlp5/camlp5-7.11.ebuild
index 542b744b42f5..999ed280a3f6 100644
--- a/dev-ml/camlp5/camlp5-7.11.ebuild
+++ b/dev-ml/camlp5/camlp5-7.11.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="doc +ocamlopt"
 
 DEPEND="dev-lang/ocaml"
@@ -29,7 +29,7 @@ src_configure() {
 		-mandir /usr/share/man || die "configure failed"
 }
 
-src_compile(){
+src_compile() {
 	emake out
 	if use ocamlopt; then
 		emake  opt