gentoo auto-resync : 26:08:2022 - 14:52:16

15 files changed, 143 insertions, 26 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a74754cf7825..21462555d5b4 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 55d299b07612..9568f17864ea 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,10 +2,13 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
 DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
+DIST llvm-project-15.0.0rc3.src.tar.xz 112081940 BLAKE2B 659359f8366ad09051fa2256c1aae8cea2049ab6428ce6b15a6845f7ee01a27bc2be2ab612adf8364cb2d699f19d09a7ea01eda74b266f14cc844662bcc833e0 SHA512 e4ac310c19fd6b710d372b9a53dffaf6736d4b5c23190fa98536be40f7c4e45670957dcbfb337e9d1dd44398df43d1ae736063eff2b2fd3d6fc752fae286d3bb
+DIST llvm-project-15.0.0rc3.src.tar.xz.sig 438 BLAKE2B 455181d3845ff1766f463d0e02caf72df8106dad16b8d54234f7f2fa0fcb5636abb06b2d35b5fdb8a3ed5c92a41a47d413d1bb76013cb914ce79913479a786e2 SHA512 80a67cf48186d2fbde997707e5d3d7a2dc3097f07e32ff45277e5185eb358d6b292821d8eaf8570fcc45560340663d62adb0380c675909c4c9c713e52704c800
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B 4125904f29738c9d1df5dda7737d2edb1e68512f66b561d4ab4b24ebaa457da1a13ab830ab911b5016e05cb48696aff0f6cd1753615e33e8b06f5b086deb020f SHA512 7b80a864207d4c0ef50725a5e9e64c6ff0956b4dfd3f6c55f4363f44703a7113205a39a53624e288562b08ca3191bd11cd7615ecb53395e07777ae7161a173c4
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f829c7c13b55cc142348fa2ac7feff500ddaa00929e7c0152f114cc3dd257f20063290d40a725a5cf05fa51c3ef7072 SHA512 a323d719faa75764be7ae4e663beaf806836b8388521c3aec93ea07a2f3e001a130c7881a15137a7199660a3e0e7baf646391817b09921dab693adbe03c2d173
 EBUILD llvm-ocaml-15.0.0.9999.ebuild 2578 BLAKE2B 4daf57c17c61d1195d65de9e2dd0f4f7c55b12dbb829349662db0f8fadec64172daa3d9370bc1387391f326f87b2e03de36ed37a12e72b083beb3e05d79cea12 SHA512 07e210df38ff33721074f544263feebe4a37be0d41118d3c93a820c459e735244c5914a8198df6ce347c4367ea9ba670c70bf54e800684d37121470a76dcdb8f
 EBUILD llvm-ocaml-15.0.0_rc2.ebuild 2578 BLAKE2B 4daf57c17c61d1195d65de9e2dd0f4f7c55b12dbb829349662db0f8fadec64172daa3d9370bc1387391f326f87b2e03de36ed37a12e72b083beb3e05d79cea12 SHA512 07e210df38ff33721074f544263feebe4a37be0d41118d3c93a820c459e735244c5914a8198df6ce347c4367ea9ba670c70bf54e800684d37121470a76dcdb8f
+EBUILD llvm-ocaml-15.0.0_rc3.ebuild 2578 BLAKE2B 4daf57c17c61d1195d65de9e2dd0f4f7c55b12dbb829349662db0f8fadec64172daa3d9370bc1387391f326f87b2e03de36ed37a12e72b083beb3e05d79cea12 SHA512 07e210df38ff33721074f544263feebe4a37be0d41118d3c93a820c459e735244c5914a8198df6ce347c4367ea9ba670c70bf54e800684d37121470a76dcdb8f
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2578 BLAKE2B 4daf57c17c61d1195d65de9e2dd0f4f7c55b12dbb829349662db0f8fadec64172daa3d9370bc1387391f326f87b2e03de36ed37a12e72b083beb3e05d79cea12 SHA512 07e210df38ff33721074f544263feebe4a37be0d41118d3c93a820c459e735244c5914a8198df6ce347c4367ea9ba670c70bf54e800684d37121470a76dcdb8f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0_rc3.ebuild
new file mode 100644
index 000000000000..3f682163a64b
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0_rc3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index 62b045e10e7f..61ef76235fa7 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -2,4 +2,4 @@ DIST ocaml-fileutils-0.6.2.tar.bz2 43060 BLAKE2B 20828875a25b1a9d2a41bf495cda00b
 DIST ocaml-fileutils-0.6.3.tar.bz2 43157 BLAKE2B a9adf17d028abd664dbdec3fefa301a6b502941a6da4ef9c3ef02b876f187d224e404f6a9ffb5460035ba475154c60109a5218cb8b9bb36153ca791f8d218e7d SHA512 2c5e75b894e9f5e3b003d61977a87f5c6964a89d844949eedc55f97c5875cc52052182420bbb4e73925d306479c66400df74e4adfccc5b2102347d13e99505cf
 EBUILD ocaml-fileutils-0.6.2-r1.ebuild 775 BLAKE2B cdf62f36180027a56381792f0f9306240226ef81d8f01dd29bc0756d7b7a2d20bbfd1940b032310a690e862a2d284fc8200a9ea4242549f3a3304d89cea3cede SHA512 09d95b929e3bbdc37ad5c68484ea11549bf38c6c5190134e27d00e10d2c8b58f233ceb29b6a9f690d994998ded11c41618e873fa77d7f12ecf1520312112bb22
 EBUILD ocaml-fileutils-0.6.3-r1.ebuild 771 BLAKE2B aa85f143bdba377c50ff511a0b1eed5a6cf632b0296a24f35fcbc8ddbbb90b7cadf1cef9337abd8fbf8f37ca7b5c197b4c9cc09ec198348b228081152508f03e SHA512 0ff57513190df4599ca5a2f8bb0841ca5b35c947b9df7e6331875463438c8fa845c6eb0ca631c772cc5040105e2b524fe9b92d1eacf1abfa90722b543a7c171b
-MISC metadata.xml 830 BLAKE2B ec0ca5f96973ae11686041c12fe7d29ba85ad071db6a04e2ca15049668aa28a62169f37e47030e8f23cdbc8711528810551bd5b009d444fef15a881e52b66f32 SHA512 18e7f573e1e031bb6ca0f58f0534e1bc01a9a155c5ecb6dcd3e1c774de4aeb0b14aaabc8ad98724cf08c3258a5fa4524e4f5eb5b2a6d41e9ff87dd0cfa1a525e
+MISC metadata.xml 841 BLAKE2B 32a80d7ffc608de8e8ab0631ae867739de449825bbd2fdf814fe2d41ccc87cce3f6831faf3288ab1dee5e5ee8b71502679b769067f7663a6122bb6555c7a9a5d SHA512 c4e7e187c24d34c756e4bfd37d8d277c62d726e53871f306cfbe6f1eab83a6f0db0c23948c61ff856b2704b3524632b405ee9c821c067c49b982e350d7130174
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
index 8c93c36b4450..4c6f3e0e9c42 100644
--- a/dev-ml/ocaml-fileutils/metadata.xml
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -20,7 +20,7 @@
   <use>
     <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
-      match dev-lang/ocaml.
+      match <pkg>dev-lang/ocaml</pkg>.
     </flag>
   </use>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-gettext-camomile/Manifest b/dev-ml/ocaml-gettext-camomile/Manifest
index fb12a58aa11b..6352c1d2c294 100644
--- a/dev-ml/ocaml-gettext-camomile/Manifest
+++ b/dev-ml/ocaml-gettext-camomile/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
 EBUILD ocaml-gettext-camomile-0.4.2.ebuild 959 BLAKE2B 9353ce7e936239a8983ee9acbb43bb1b3cc586925fc1714f285ea0f26ec293763bf7e2360ef722b8bb30cded88f30bf18681715eceff4626841c2cc91f6bb5e8 SHA512 149c5e49befc68e5b61234554fa8a8f0375f3a43d6d25fe965eba5210594cf83fa7e930cd54367cfe0eefbdfddbe94509a91df05d85559646b715a7b20694009
-MISC metadata.xml 663 BLAKE2B 5e9c4bc463940173b2ccb2a90ab4c4b6171c3492edc3eaf17a2a6f5b98b9de8d4c65aef5c0359cb71cd1b03f00cf79d30265e178b7ff0839ee4ea15385dc7eec SHA512 3bd44af35d19acd78604e39c5f25efa6a24f8dbd2065a13d5dcfd46da41c11176117468c3fd3df2b1ae2db9e4ee9ecd3ac9023fa9fb0562bc0eee87b975cfc1b
+MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext-camomile/metadata.xml b/dev-ml/ocaml-gettext-camomile/metadata.xml
index 7366e353387f..69bd315a05d9 100644
--- a/dev-ml/ocaml-gettext-camomile/metadata.xml
+++ b/dev-ml/ocaml-gettext-camomile/metadata.xml
@@ -15,7 +15,7 @@
   <use>
     <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
-      match dev-lang/ocaml.
+      match <pkg>dev-lang/ocaml</pkg>.
     </flag>
   </use>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-gettext-stub/Manifest b/dev-ml/ocaml-gettext-stub/Manifest
index ffce8a483161..77df63473a79 100644
--- a/dev-ml/ocaml-gettext-stub/Manifest
+++ b/dev-ml/ocaml-gettext-stub/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
 EBUILD ocaml-gettext-stub-0.4.2-r1.ebuild 980 BLAKE2B ab0d24a1938da9793d804e1d54cdd61557afbe8573c71a6eb03d9f30100b9f1a81c4684ec09cb85725ee0b2bf858431cf0c319bbc1da348ca4546526b842b46c SHA512 000a15d0b62b5feb0e537254ec547d67a530a07269470b90a8dc861389c1926d997bc2459b27a696f6522d140e3f23ecca5466fcbe9a487b4f4183c65a01a781
-MISC metadata.xml 663 BLAKE2B 5e9c4bc463940173b2ccb2a90ab4c4b6171c3492edc3eaf17a2a6f5b98b9de8d4c65aef5c0359cb71cd1b03f00cf79d30265e178b7ff0839ee4ea15385dc7eec SHA512 3bd44af35d19acd78604e39c5f25efa6a24f8dbd2065a13d5dcfd46da41c11176117468c3fd3df2b1ae2db9e4ee9ecd3ac9023fa9fb0562bc0eee87b975cfc1b
+MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext-stub/metadata.xml b/dev-ml/ocaml-gettext-stub/metadata.xml
index 7366e353387f..69bd315a05d9 100644
--- a/dev-ml/ocaml-gettext-stub/metadata.xml
+++ b/dev-ml/ocaml-gettext-stub/metadata.xml
@@ -15,7 +15,7 @@
   <use>
     <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
-      match dev-lang/ocaml.
+      match <pkg>dev-lang/ocaml</pkg>.
     </flag>
   </use>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 7c925fcb3f22..d1a85dbfb2aa 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -3,4 +3,4 @@ DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
 EBUILD ocaml-gettext-0.3.7-r3.ebuild 1596 BLAKE2B 1ccc4550cc137417c306482d698a453ae2a298cb4c2f7c4a0fea2ea91c2875f4d07715c0367377662e7680db7c85e04370dcb0edf8092fa3bc71b90deaaf1cd3 SHA512 358f834ca7ea70a153d110a091cf096e4bb26ab413dd66c21a204d300f557dc9b562ea795f6089066804f18324041b0b1338a2d1363f7664ca66e0319a3c89f4
 EBUILD ocaml-gettext-0.4.2.ebuild 917 BLAKE2B 898206729a10a4e6a7109dd9975393a51ca1d5d528ce3de6566348c14f28a9771a731221063a0ac6466511257bde2d2766882c8ead2dc8fb9f13280c9d4075c5 SHA512 eb3e47e901bb47b21e5dca54106cb8d9d1816a5458ca5668fd7cabece316a0364a901c26759a8f45afaf9eb0bd923fdfd34e59fdd73f2ceade4fa53e4bc9ad12
-MISC metadata.xml 663 BLAKE2B 5e9c4bc463940173b2ccb2a90ab4c4b6171c3492edc3eaf17a2a6f5b98b9de8d4c65aef5c0359cb71cd1b03f00cf79d30265e178b7ff0839ee4ea15385dc7eec SHA512 3bd44af35d19acd78604e39c5f25efa6a24f8dbd2065a13d5dcfd46da41c11176117468c3fd3df2b1ae2db9e4ee9ecd3ac9023fa9fb0562bc0eee87b975cfc1b
+MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml
index 7366e353387f..69bd315a05d9 100644
--- a/dev-ml/ocaml-gettext/metadata.xml
+++ b/dev-ml/ocaml-gettext/metadata.xml
@@ -15,7 +15,7 @@
   <use>
     <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
-      match dev-lang/ocaml.
+      match <pkg>dev-lang/ocaml</pkg>.
     </flag>
   </use>
 </pkgmetadata>
diff --git a/dev-ml/react/Manifest b/dev-ml/react/Manifest
index 8754396960d1..3455e8fece0a 100644
--- a/dev-ml/react/Manifest
+++ b/dev-ml/react/Manifest
@@ -2,4 +2,4 @@ DIST react-1.2.1.tbz 39184 BLAKE2B 0ad5fd576c08292011e6543462295a11b77048f59aaaf
 DIST react-1.2.2.tbz 40013 BLAKE2B 302f480cf2cc88fc8a97b262d41809ed4fe904d3ea4cdec8ba80a8bdc99b3ffc1c9f19cf853c3d40587a34ba7608734e60ede5b756479676af95f9470e1badac SHA512 18cdd544d484222ba02db6bd9351571516532e7a1c107b59bbe39193837298f5c745eab6754f8bc6ff125b387be7018c6d6e6ac99f91925a5e4f53af688522b1
 EBUILD react-1.2.1-r1.ebuild 660 BLAKE2B a090ae7ac7f4a371aec1b5730a8ef3d85f310d0e334f5188763be981890100af0acc8b3fa14b657dfc5c49f93871a7b163a67d95d138f1354f561a5d3f0a494f SHA512 42c053d74744f3d23f84397dc521203f553b017a7ddca21b6fef05afbcfa4b1ebdbe92d974ae79d726f484544b77a6813466dd2ac1c9d233cb48df9065eaed87
 EBUILD react-1.2.2.ebuild 777 BLAKE2B 176ebeca42a9a81898ce64da3e7d65c08fefb3c61321cae0c546429edf89810a92642f3409d72a726991bd975a984f122474a57110b250cbe8285be2e4fdf520 SHA512 164ea5b20446cf5793087bb284f53ae9bf9498eab516ea004872ef9f50d7b8767777e4ba47b3c25ae41156cb87121111aec9ba3b564c3fd0bb1af503b35982f2
-MISC metadata.xml 1059 BLAKE2B f4bc6ae58d39664c9782e4d9bdfef2e2ab3d67a942db524009a677a246990f75d35819cecdbe770c7d6aee3223835aa686cf41021dd25ce61b139547714a998e SHA512 4826ec1ed4b68d4c166140fa86f7e80842ffaa83f37cf46781530c2837d2b441981dc1f4b93787a305842b061fa33f9c368e029870363c95e1ed84879cab19ac
+MISC metadata.xml 957 BLAKE2B ffab75891fb139f7d7e87231732f337dcead0f66cdfd376d1117027cbe6100633c55c75cc63644672417aba281f9e8eeb42ef703c7754bc85e650ccbe2b40902 SHA512 fd95bb4e0207932c8fb09e82721a20c7a791b9f9e44e2480f31dfb3201e2bf1f4221b2216c9ea12093da0bf7e81dba340eefd0a42e5f406033fd26222067d635
diff --git a/dev-ml/react/metadata.xml b/dev-ml/react/metadata.xml
index e6107330d4f5..959d68873dec 100644
--- a/dev-ml/react/metadata.xml
+++ b/dev-ml/react/metadata.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <name>Thamognya Kodi</name>
-    <email>contact@thamognya.com</email>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription lang="en">React is an OCaml module for functional reactive programming (FRP). It
-    provides support to program with time varying values : applicative
-    events and signals. React doesn't define any primitive event or
-    signal, this lets the client chooses the concrete timeline.
-    React is made of a single, independent, module and distributed under
-    the new BSD license.
-    Given an absolute notion of time Rtime helps you to manage a timeline
-    and provides time stamp events, delayed events and delayed signals.</longdescription>
+  <longdescription lang="en">
+    React is an OCaml module for functional reactive programming (FRP). It
+    provides support to program with time varying values : applicative events
+    and signals. React doesn't define any primitive event or signal, this lets
+    the client chooses the concrete timeline. React is made of a single,
+    independent, module and distributed under the new BSD license. Given an
+    absolute notion of time Rtime helps you to manage a timeline and provides
+    time stamp events, delayed events and delayed signals.
+  </longdescription>
   <upstream>
+    <bugs-to>https://github.com/dbuenzli/react/issues/</bugs-to>
     <remote-id type="github">dbuenzli/react</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ml/stdlib-shims/Manifest b/dev-ml/stdlib-shims/Manifest
index d99460280141..c2943beae357 100644
--- a/dev-ml/stdlib-shims/Manifest
+++ b/dev-ml/stdlib-shims/Manifest
@@ -2,4 +2,4 @@ DIST stdlib-shims-0.2.0.tbz 15980 BLAKE2B 4d83b8642a4bccc9f090c0a2f23a4d2f16bbf2
 DIST stdlib-shims-0.3.0.tbz 10163 BLAKE2B 442f07a9b80fb915a0254ba814227798c838f9fa4c6e9a94c4b99c22ca25844f121de235cb758707179275da9200cd45cbb6e68392b0217af97c6e1bb04a13a3 SHA512 1151d7edc8923516e9a36995a3f8938d323aaade759ad349ed15d6d8501db61ffbe63277e97c4d86149cf371306ac23df0f581ec7e02611f58335126e1870980
 EBUILD stdlib-shims-0.2.0.ebuild 496 BLAKE2B 677b25b0b531a8dc4e9ccdc0c0011335754aaa4843875305991fccc814526f74dddb7644865ce7106e184ebd29ba69ad99dcf699811e2a110e3bcad0a9bdf633 SHA512 6a67fb215e83903c3e9a20f6ccffbdd095f01ee54d1278f2fb40f5179b95937b67bdbd1f45b8c3a488144867ae2016d4d9f970bad87cffa228578741e42efbdf
 EBUILD stdlib-shims-0.3.0.ebuild 503 BLAKE2B d8fd34fc8bda95281a91061266f592541a2e74bbe22b13c988b2f9ffbbc4c34643a0a9e4c01715b3add1cb47b85fdd3c08d10d814235b47ba368f8e02235b526 SHA512 205d1a4f74c10cd653a416a64623392b0313a74a397535d5a3a809daf226553be367c8766c62cfbd6ecb49b3c4fea6f43a19365632a9979984fe0fca307fe845
-MISC metadata.xml 895 BLAKE2B 74b7031dde405fc76a61931db210dd593deff24eb2eb0b97608d9b41d05197aa57c3b1ac05e3278cc6bed373ce3e12d124408dc550cb2aaae56d34ae2a714355 SHA512 435472e56e1b1fd7bb7e050d27ac40ec5cfda05b67fe88b7f4aa0a6d4e785a6324f01340b32ad7a58c5173d4db06e61fa68c11d805dc9fcbf806f3df4b942545
+MISC metadata.xml 906 BLAKE2B 0a1c84e38583ffb6e45245c6d65f5f3f01d9d40dba57efd71c26d5d9d245dc28b0ea081b20cabf0e8b3472856f14dca7dacc837569a811d68377ef2cc077aff2 SHA512 d7dda97c55d6a8e90ed97fd2686d0bb03e192ecfc335f2ef1c5e3c23cc73acfa978b1c70b77bca0a2cc7d9a1790d5c3fe5b09a1b9f2ba4b46ced22adceba14b3
diff --git a/dev-ml/stdlib-shims/metadata.xml b/dev-ml/stdlib-shims/metadata.xml
index 9eb14ab819d0..20ede2e739d5 100644
--- a/dev-ml/stdlib-shims/metadata.xml
+++ b/dev-ml/stdlib-shims/metadata.xml
@@ -20,7 +20,7 @@
   <use>
     <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
-      match dev-lang/ocaml.
+      match <pkg>dev-lang/ocaml</pkg>.
     </flag>
   </use>
 </pkgmetadata>