gentoo resync : 25.11.2020

6 files changed, 141 insertions, 3 deletions

diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index b758291bb663..5c9baa8e5c54 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -1,3 +1,8 @@
+AUX camlp5-7.12-destdir.patch 443 BLAKE2B 6a1dc0403c2ca37ce1197936e36abedc3979fda209130c92c31c4080d3026cf85d1989b2a0cd7c23fc989d45cad5464a79f12ccc9236463b615115f538887050 SHA512 f4071f731e32a071fa4850c5ac54691603b2b3a414c4618978bd2822652b8d9f60d86d8495a0f5001e53cfe27d8dfabe83d3717d5ad2d9050e6eb1b68dc35078
 DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159
-EBUILD camlp5-7.11.ebuild 1007 BLAKE2B a8f26da86128f38f61b0d30255ae11dfabbfd7553c02dc78fea9e6c7afcc9836ba0165649064613085065cc302c95f7980af02f9ce151c94836308b5b6261072 SHA512 33405d07149ef4041789ba5c780b93cbc611be4eeec37f4d8d0efec293eac22e65ae87265d6eed341fd5abe721b97804fafcb5124acd936088b49d86aaf892db
-MISC metadata.xml 325 BLAKE2B e1e22f9260b70f58e523e16ba3f5a9fd8b58050ed7ba2107af06db261129f190620aee89c824557af3f5724b4f78ee5b4899addeee6fc9572315a2640f9d666d SHA512 52021194baa57054aaaad66864a51fd2bdf9c161e32fe78dcb1541480cfa03780645e3c1bb64271ce21015af26f2362fcb620c44c80253db82e06e1d38ed95b9
+DIST camlp5-7.12.tar.gz 1008350 BLAKE2B 8f390f6d617a6ef029462aa74ca4d80c0e2eb267bb6957aac43fdecc425aae34dfc7f3e572c8a1f4ee6b032dd90b3b8262094f80a19ea0bb19b80a88d22d3f28 SHA512 233d973b0a968a7812b977e8a37da8e8daa0f3ef81ca7c473d83c1602380dae6c14f94daffb6bb799f8d90fab121238a46e89a233202cd6f622b0da2f728c0c0
+DIST camlp5-7.13.tar.gz 1031832 BLAKE2B 2afd7e269092d9c40f263e9ce92b3b9f66b0b3f0ae01da43e2094c6a919aa9f26790030f835b630547d51e7bb4a08e74ac8522e7f308864896fa0414370f8f2f SHA512 8ab94b951e6791be895c70e32b930e498229c9ba7bccc505a3e7c2a91ca12fe038b979b9d5822b43e9c74ee2bf552efa1af7a61f1d287100803efb540d5db8b2
+EBUILD camlp5-7.11-r1.ebuild 1028 BLAKE2B 1fe3e0ddcc521d416bc5f5b917178775a5f14ec45a46645dfa3ab9ddb02d3b034f75a815c9046a24dab1322a4cb878cde93cde4d9523834c4708bc245e8ec10d SHA512 54e1608ad6f238c65699c172ac78dd558b3e2038224fd11cb68a7df60b97ee06d149a598f15b6439a729aa1f30a10025849d04862af08a8f07febe3b4867a401
+EBUILD camlp5-7.12.ebuild 1278 BLAKE2B 7bc87a12ff2dcfc4ec043d78479d03745c98d01ec8540d6fba3128bd58caf1b7eed137535b86f8f5a0dffde50c90a58b5d398fa2ab0d1a1361fadb805976b5b6 SHA512 cb2c7464bd37fe71efd94e7b604e68454480384cfb68f1b409a8f57e98504aecf0b03120dd8569f08b964995f94cd5bda4ad5a322605a92b8ad3393a4aac0d87
+EBUILD camlp5-7.13.ebuild 1091 BLAKE2B e96813ca2ec1c8e2d1f49b1ff541467aa3801fd2bb0ee036588a9440916562a7a8bd184d8cd1f730e5c9aab70ebbf85ceb9be37ce551959985f71a57ce7f5004 SHA512 05477b46f85711d1a8bff84f44a75dc8346a87e84fb357a349297666f73cbf8d54b36d91c9111cc5991c7cad15bbd10fd1a478eb9ef2920b1e5a1fab90260ef4
+MISC metadata.xml 430 BLAKE2B b86085580138b59733fbfb751c9a1132428f6c21c9633274cad4cf2e579ef9779317e3c935e117356ca59d741978c2e68c89435952982e8eb0b4c12f3f9f3c97 SHA512 48d26da358e022e6d3eb273046176496387b9bc0f7469cf534130070fa13a45b47728977c96a2ef8dc4b7568ad6ac82bfb7a669b16b1d021e8e7fc06a0be2f71
diff --git a/dev-ml/camlp5/camlp5-7.11.ebuild b/dev-ml/camlp5/camlp5-7.11-r1.ebuild
index 12f10b2cd865..5f91a735d0e7 100644
--- a/dev-ml/camlp5/camlp5-7.11.ebuild
+++ b/dev-ml/camlp5/camlp5-7.11-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 ppc x86"
 IUSE="doc +ocamlopt"
 
-DEPEND="dev-lang/ocaml"
+DEPEND="<dev-lang/ocaml-4.11.0:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 
 QA_FLAGS_IGNORED=(
diff --git a/dev-ml/camlp5/camlp5-7.12.ebuild b/dev-ml/camlp5/camlp5-7.12.ebuild
new file mode 100644
index 000000000000..5b42e456fdf2
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-7.12-destdir.patch" )
+
+camlp5_hack_ocaml_support() {
+	ln -s "${1}"    "ocaml_stuff/${2}"              || die
+	ln -s "${1}.ml" "ocaml_src/lib/versdep/${2}.ml" || die
+}
+
+src_prepare() {
+	egit_clean
+	default
+	camlp5_hack_ocaml_support 4.11.0 4.11.1
+}
+
+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
+
+	dodoc -r doc/*
+	dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/camlp5-7.13.ebuild b/dev-ml/camlp5/camlp5-7.13.ebuild
new file mode 100644
index 000000000000..470b0612971b
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.13.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-7.12-destdir.patch" )
+
+src_prepare() {
+	egit_clean
+	default
+}
+
+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="${ED}" install
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META
+
+	dodoc -r doc/*
+	dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/files/camlp5-7.12-destdir.patch b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch
new file mode 100644
index 000000000000..d43a29c97d3f
--- /dev/null
+++ b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch
@@ -0,0 +1,13 @@
+Index: camlp5-rel712/Makefile
+===================================================================
+--- camlp5-rel712.orig/Makefile
++++ camlp5-rel712/Makefile
+@@ -57,7 +57,7 @@ install:
+ 	for i in $(DIRS) compile; do \
+ 	  (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR); cd ..); \
+ 	done
+-	cp etc/topfind.camlp5 `ocamlc -where`/. || true
++	cp etc/topfind.camlp5 "$(DESTDIR)`ocamlc -where`/." || true
+ 
+ uninstall:
+ 	@if test -z "$(LIBDIR)"; then \
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
index 7994efd51d47..cafe415ffc77 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/metadata.xml
@@ -5,6 +5,10 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">camlp5/camlp5</remote-id>
 	</upstream>