gentoo auto-resync : 22:03:2023 - 12:42:36

4 files changed, 26 insertions, 21 deletions

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 3b28d2f686fb..f721db475033 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -4,7 +4,7 @@ DIST findlib-1.9.3.tar.gz 264132 BLAKE2B 3779cb437c607d04ae6c7d8124270f36c9bd9ba
 DIST findlib-1.9.5.tar.gz 271240 BLAKE2B 6f43281298a9e443f9b92bcb8996bc2a55c2be86df492540fe8b5fb3fbb199daf1daef68e14c981d153c885c443ebc4af9ffb957235dd14904b9d75ca387cfa2 SHA512 03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715
 DIST findlib-1.9.6.tar.gz 271246 BLAKE2B c9c98b9e92c0cf690e2c8794a1ed606c0288d49a016dfa08592c9f617be1020385f52bf37345a7cbcbc7f0fcb19750a6617036cbf90afef231eccdbc7132baf8 SHA512 cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027
 EBUILD findlib-1.8.1-r2.ebuild 1686 BLAKE2B fd37fe0b5b698b8c454c0f13cfc0a59157d9233bc8f75a81045cd2bebf14493f8f72fce5df84eaec1d3b5a73aabee840165bc9898cfac6bd2bfd9a84a75247fd SHA512 147a1448f6988851f2e515bf132956759f80c2515250fffb30ab73ccafcf2625ca838417e08f1ce1c4073d6101425795232ae930dbb759837a4671d5f7e5498c
-EBUILD findlib-1.9.3.ebuild 1629 BLAKE2B 317efe014265fc845f87e01ac3247f4e413cf06ad4a0bff82d9b812e9b2dbc76d63d7ecc0bfa66749169607250e4fa76f39b936c075942cfee9cf6f8df1aa5f8 SHA512 50eb214c4b1cba4cbf8eaac9c080a186e47c25939148cb80eda4dadec6ef613456018115d8addb82cf2047ddcfc726b1494c178c75647026e58df6ab1161eab8
-EBUILD findlib-1.9.5.ebuild 1636 BLAKE2B 71a2be517b45a50fe8296697345f11caab52b9fa560e35719c634d1bae86cc46a4ef1acc606a7aafc57a9f15aadb1aa880a16cbc0fd2fa25853d8f6c41cb4ad4 SHA512 353afc7260150373f416377f168ba39797294d8649b37067ad829e86193d2b90b9cb6acb81d27217b0be10ba269d59a90a5ec22415575ade77947231a8aa4a02
-EBUILD findlib-1.9.6.ebuild 1635 BLAKE2B e81391c2bdd591c57497e7e067d472487cdb8735347498bf39fd62bed0b1c429c8d9df894fe88a32125555fe9d0b68b53561d4ae2be0a7ceea178b92af3e19b7 SHA512 9f97bbce216a5c20d46182067f6dac63c13e2c44e0628d8bdf36579e08c30b94a08f7b72ad90dfdf19b9479142574e9cb00b0116c3b986febf79f7beb5ff584b
+EBUILD findlib-1.9.3.ebuild 1736 BLAKE2B f20a10ae2494692bcfa9917cdbdcf4bcda35a3298d42d4d1bca75356672e9cd74b4e55db1e620b66b302efaeece4e05f99de38aa17871fa0dd87d11d5fdda291 SHA512 2489cb7571bfafd101ed61b49be354697bb029236e5fb2f2f33a4ed40dfae5ad0bf289bb2db70fef4b5d21f08723a5cbc115ef4444047d1e4732889aa69f7ebd
+EBUILD findlib-1.9.5.ebuild 1763 BLAKE2B 5c7b6bf74a729291f37b31c4973d2aa93fe42df93d01cc2adcd9d97884fe599bd326ba975ac8bf02dcfe653a1a23695be3278d5855a289a41e91e7bba9ff8e8d SHA512 e17d94e26975d0f4df18773e0ff3909ffcd9727a544dfe6166d07adab4e75f9121b0155e8de39b22c15bbae94cb2dd688de9a2869ee4142044366120df6f9b42
+EBUILD findlib-1.9.6.ebuild 1762 BLAKE2B 297b168382196d1344ec55eb6c0be3deaa4f814a45d25d0566b67ea364f78e2c97fbd0a966e82e48132dd8480c1a45dc7f86a693e835ad56fa70c254107ec3fc SHA512 996dfea0e725c1b91ec9dae027731eb9771db82ab06b67aeb388629e93167bfcced95f9f994fb29085c0b3331a6ab72ab213c0df2df6dc7de17f920bfa6eb735
 MISC metadata.xml 418 BLAKE2B 59a2e1618b3ebec5343c419a335c5cef124f844ee5beff5e8deb3d94b48aed5f1b9f85301f348f85a518d30516a40bab613f3750a8612e8b7a4baef2966dc15a SHA512 5451f3a709e9aa824bd3159dba3f50060e7df6d097ddbfe1cec93e933c34869b5eda66e5fc8b6cfb54940820fbb829ed8b3b1fc6555e06b117bc738f7ea7a1fe
diff --git a/dev-ml/findlib/findlib-1.9.3.ebuild b/dev-ml/findlib/findlib-1.9.3.ebuild
index 72f0e01b3a7c..96186048ba26 100644
--- a/dev-ml/findlib/findlib-1.9.3.ebuild
+++ b/dev-ml/findlib/findlib-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,6 +52,9 @@ src_install() {
 		docinto html
 		dodoc -r ref-html guide-html
 	fi
+
+	# See bug #803275 and bug #833604
+	rm -f "${ED}"/usr/$(get_libdir)/ocaml/{ocamlbuild,labltk}/META || die
 }
 
 check_stublibs() {
diff --git a/dev-ml/findlib/findlib-1.9.5.ebuild b/dev-ml/findlib/findlib-1.9.5.ebuild
index 6d9c0f236c54..c25719598182 100644
--- a/dev-ml/findlib/findlib-1.9.5.ebuild
+++ b/dev-ml/findlib/findlib-1.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,21 +52,22 @@ src_install() {
 		docinto html
 		dodoc -r ref-html guide-html
 	fi
+
+	# See bug #803275 and bug #833604
+	rm -f "${ED}"/usr/$(get_libdir)/ocaml/{ocamlbuild,labltk}/META || die
 }
 
 check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
+	local ocaml_stdlib=$(ocamlc -where)
 	local ldconf="${ocaml_stdlib}/ld.conf"
 
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	if [[ ! -e ${ldconf} ]] ; then
+		echo "${ocaml_stdlib}" > ${ldconf} || die
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die
 	fi
 
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
+	if ! grep -qe ${stublibs} ${ldconf} ; then
+		echo ${stublibs} >> ${ldconf} || die
 	fi
 }
 
diff --git a/dev-ml/findlib/findlib-1.9.6.ebuild b/dev-ml/findlib/findlib-1.9.6.ebuild
index 8fa3b2537783..d910ebfe9580 100644
--- a/dev-ml/findlib/findlib-1.9.6.ebuild
+++ b/dev-ml/findlib/findlib-1.9.6.ebuild
@@ -52,21 +52,22 @@ src_install() {
 		docinto html
 		dodoc -r ref-html guide-html
 	fi
+
+	# See bug #803275 and bug #833604
+	rm -f "${ED}"/usr/$(get_libdir)/ocaml/{ocamlbuild,labltk}/META || die
 }
 
 check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
+	local ocaml_stdlib=$(ocamlc -where)
 	local ldconf="${ocaml_stdlib}/ld.conf"
 
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	if [[ ! -e ${ldconf} ]] ; then
+		echo "${ocaml_stdlib}" > ${ldconf} || die
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die
 	fi
 
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
+	if ! grep -qe ${stublibs} ${ldconf} ; then
+		echo ${stublibs} >> ${ldconf} || die
 	fi
 }