gentoo auto-resync : 15:09:2022 - 23:13:44

6 files changed, 34 insertions, 12 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 2ccdc20de388..dd31dad8ae32 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 7614b8ce0a65..04e47a7ff03f 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -2,7 +2,8 @@ AUX R-3.4.1-parallel.patch 487 BLAKE2B bb596d66fab359511c6364ac06cbbe311decd3201
 AUX R-3.4.1-rmath-shared.patch 899 BLAKE2B 0aba9c1c5417531647bed3829d53909e6f3983dea3f3de149c0ef270a8bc4eddc46dab4cbdc7cce78c0c163446a4d3a014afc9bc571f0d4a61cfa6827e40f16b SHA512 20c62b774149ae1959d28217a1be6f30968562de3ad5e4a8d7bfc7c579ca5c35fcd1304d68e222be0a37cb6db9b946fbe82d21a26fecccbecea1401b8c0b25d4
 AUX R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch 469 BLAKE2B ee716b068316bbac0c07fe44bef739a491af5f4e90ba268cf7db428350763d498ab0b1bc9efa02ac885d0ac64aa5d076deaac094725766e340cbcd9d7e839b22 SHA512 cb7bc73fd0f1aa4159b25bc76318074662afddafdef8acc8caf20afb98da6c065c3bd0895c4a7a7f18a174d21d59c0f054a46aa513db1b5b622a110e7c54e171
 AUX R-3.6.2-no-gzip-doc.patch 443 BLAKE2B 1154e9f67f08e1d8b286152bd093789a0b94b3a2422bdb54d1d1d03729bd892811e68121309c41ef4323ed31efcea82f3e265b37445e9870bbd88c5413311345 SHA512 99678dbf809761a2991cd5cbe6ff5ba8d1c3e9388f69d94b30726caae4eee29ae50ee74aa24e3851d41559f804381ec18a2cd818b97b5417bf7ae660c93ad2a6
+AUX R-4.2.1-reg-packages-testfix.patch 950 BLAKE2B 99823d76d11c8d76755304bb28019526d3b06ee1747d7fe2773d26c3234e29fc847194ad58204c5eb8a231c3c1b4cee8b9d9df2f850e288fb08f0c6a29fe4bab SHA512 4ade0da830d3d223d7a308ca332cdbaba6a61c2f8d893ac21ff3a9fff3491bf72deb12f806dc9574e41c1352e3f3afc570c6a7dbcaa980b3dab1c330fe91d9b5
 DIST R-4.2.1.tar.gz 37601544 BLAKE2B b898262a05c92e125c36a661a89be34b1698177832002f7aa21ccfcf0b30a06481e2154eea9e77a94b1ad8ca35c7bc4aead2be99b862dca7450acee1bec6a99f SHA512 c1baf46d22304c425dde79301183f80f99f2752300137b0b6f902c3e55e2419d5e9185c97de6e3c840a38f6345a6c334aa24161656d4a7f6fa01570390f1122f
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
-EBUILD R-4.2.1.ebuild 7329 BLAKE2B 82f654565aca7ae8cfcdf8a0c4a09c70ca524652972868ec3c06db357913bc4d3359333636bca217923d236ab5fce5de2d1c277b0ee90ef89862e8bf2ae8f07f SHA512 fdf0747feb6c35ec1a3a094be99d031b9a29700eae0d28df94c7d1b9ade7f0ad6033ea105d807f8e95ea0c533543f3763e02b86aed6e27f27f3880eb84fc6855
+EBUILD R-4.2.1.ebuild 7198 BLAKE2B fb6db89a05db15ba8aa50dff861fdabffec6c89ceb8953835f05f27297fa62c0a02e531bb62477672f1ddc2f7693e37a05bc903a8a7afb6de59646217760989a SHA512 eeffc566a34eb269914ea09e9e485d344be258c1ab40af8e18995e98b6a6b8511e4fd7ea9a323bbfbb0ec8c28b530486051651468615f57737f0a6ab538b1e57
 MISC metadata.xml 1261 BLAKE2B 468178b60e894bd8dff85ecbf74d10dce61bdb21fc8b61f43d7778dbc345234fc6b5e28c7608534d558c95fa6583b5acd2e55cef7096c4cff88e84776e93e03a SHA512 0d42cb1e3b951e3b1cbf09e6e48d47cf7635c8b16708b5b1edb6c5d1b422cad2f16ce5c6f7c603efb365eb9d5b794d2d2653b408147aa9e921cd57feb3840013
diff --git a/dev-lang/R/R-4.2.1.ebuild b/dev-lang/R/R-4.2.1.ebuild
index cfb2a07ff6bc..1ee01869a453 100644
--- a/dev-lang/R/R-4.2.1.ebuild
+++ b/dev-lang/R/R-4.2.1.ebuild
@@ -71,10 +71,11 @@ BDEPEND="
 	test? ( virtual/latex-base )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.1-parallel.patch
-	"${FILESDIR}"/${PN}-3.4.1-rmath-shared.patch
-	"${FILESDIR}"/${PN}-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
-	"${FILESDIR}"/${PN}-3.6.2-no-gzip-doc.patch
+	"${FILESDIR}"/R-3.4.1-parallel.patch
+	"${FILESDIR}"/R-3.4.1-rmath-shared.patch
+	"${FILESDIR}"/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
+	"${FILESDIR}"/R-3.6.2-no-gzip-doc.patch
+	"${FILESDIR}"/R-4.2.1-reg-packages-testfix.patch
 )
 
 pkg_pretend() {
@@ -108,11 +109,6 @@ src_prepare() {
 	sed -e 's:\.\./manual/:manual/:g' \
 		-i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
 
-	# Disable this test until it passes again,
-	# https://bugs.r-project.org/show_bug.cgi?id=18338
-	sed -e 's/ reg-packages.R / /' \
-		-i tests/Makefile.common || die
-
 	use lapack &&
 		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 
diff --git a/dev-lang/R/files/R-4.2.1-reg-packages-testfix.patch b/dev-lang/R/files/R-4.2.1-reg-packages-testfix.patch
new file mode 100644
index 000000000000..f5fe9667ad67
--- /dev/null
+++ b/dev-lang/R/files/R-4.2.1-reg-packages-testfix.patch
@@ -0,0 +1,25 @@
+diff --git a/tests/reg-packages.R b/tests/reg-packages.R
+index c9962ce..2d36d1e 100644
+--- a/tests/reg-packages.R
++++ b/tests/reg-packages.R
+@@ -260,7 +260,8 @@ stopifnot(exprs = {
+     (lenN <- length(print(iN <- grep("^[1-9][0-9]:", tlines)))) >= 2
+     iN - iw == seq_len(lenN) # these (3) lines come immediately after 'Warning',
+     ## and "related" to the some 'missing .. paren' above:
+-    8 <= print(iw - i) & iw - i <= 20 # see ~14
++    !is.na(ierr <- as.integer(substr(print(tlines[iN[1]]), 1, 2)))
++    8 <= print(ierr - i) & ierr - i <= 14 # see 11
+ }) ## failed in R <= 4.1.1
+ 
+ 
+@@ -495,8 +496,8 @@ checkMatrix(ap, 4)
+ 
+ 
+ ## clean up
+-rmL <- c("myLib", if(has.symlink) "myLib_2", "myTst", file.path(pkgPath),
+-         oldpkgdir, newpkgdir, repodir, backupPfiles)
++rmL <- c("myLib", if(has.symlink) "myLib_2", "myTst", "myTst2",
++         "PR17501.Rcheck")
+ if(do.cleanup) {
+     for(nm in rmL) unlink(nm, recursive = TRUE)
+ } else {
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index cfa71cb9217a..7051d11d683e 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -19,5 +19,5 @@ EBUILD erlang-24.3.3-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c11
 EBUILD erlang-24.3.4.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
 EBUILD erlang-25.0.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-25.0.3.ebuild 4970 BLAKE2B a956aa549e09eed55901972ff211d542f6a6f51d330e42925fee1d028ccd2f97d4754d8bdcb6439df282c458e8854f87d8cc7122fc4d811c161c7c08f1ffacc2 SHA512 63b75adc44342017727236021034fc0ca198f6466627f85047794102937e1c598b6361c3ce59db2184b279b33aee173103a1c85148b25741907d9e769d946526
-EBUILD erlang-25.0.4.ebuild 4967 BLAKE2B 3358d2434c9db397868ea568319739b6e0b7a051161915167c1d35ce7bb9e265dd8fa8bc10fdaf3664defba52f1779e90cde27dbb4cf5a56ee29617a43661139 SHA512 0acaaa1691c648954145c963e689e96147690f9b3ded831f033627605e866daf069d9e519d41d7a9a29d4eb663435125f48626a2cd2745e56728675821dfa343
+EBUILD erlang-25.0.4.ebuild 4966 BLAKE2B af3ca5c27f7594d3c18d9405157cb07c5e0927ef8bf1f72ea0bddc2200fe810616a5e7fea8e7c64a2fdd49b67493e94bd109cb42ec27a4d11aeda9d15022fadd SHA512 e66c54e5b3760ac5df4f7d4096ac0a016dbd31c8d5fc2fa9adc7772dd2408ce4c0b1f8293d578228e723de4ad2c7009a3cb419bb76271374220c408c35041067
 MISC metadata.xml 674 BLAKE2B a5ba4a16a6fc7cc3300471f3415c87b5563aca5af2392194401092a6c8a7888ee024526f25cd5ca20c754ced631444e49d51cad001dc4e985ef95a6aacac7164 SHA512 a830c15318fc227627aac8537d42a5ecccebd7e3cf1837d4d13cd10367a0f48d99d08480aff3e1491919dcbb42c29b38aa28b44435d50f1397e6b6aaf6fb053b
diff --git a/dev-lang/erlang/erlang-25.0.4.ebuild b/dev-lang/erlang/erlang-25.0.4.ebuild
index 3c48e377568b..f178ac284dd8 100644
--- a/dev-lang/erlang/erlang-25.0.4.ebuild
+++ b/dev-lang/erlang/erlang-25.0.4.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="