gentoo auto-resync : 28:12:2022 - 02:11:45

3 files changed, 27 insertions, 2 deletions

diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 2251b167e335..bd06643def96 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -5,9 +5,10 @@ AUX R-3.6.2-no-gzip-doc.patch 443 BLAKE2B 1154e9f67f08e1d8b286152bd093789a0b94b3
 AUX R-4.2.1-reg-packages-testfix.patch 950 BLAKE2B 99823d76d11c8d76755304bb28019526d3b06ee1747d7fe2773d26c3234e29fc847194ad58204c5eb8a231c3c1b4cee8b9d9df2f850e288fb08f0c6a29fe4bab SHA512 4ade0da830d3d223d7a308ca332cdbaba6a61c2f8d893ac21ff3a9fff3491bf72deb12f806dc9574e41c1352e3f3afc570c6a7dbcaa980b3dab1c330fe91d9b5
 AUX R-4.2.2-browser-pdf-prefs.patch 3653 BLAKE2B 5083e6b99e0ae41a96193f92fbf2daec04a797996ceec68eb83973377173079e4101c07f594b507f29ba4d4d42c8fe22174847376df26f77bfe156bbd3705827 SHA512 06124b7f67c6cd29b2630239e62a73b2ecb13c34cc683a1f9152d492f9608f87f6da325a418869699e11e1bc4813c5c1a5ea95cc59d462d74c8e474e61f6fc3d
 AUX R-4.2.2-isspace-without-readline.patch 733 BLAKE2B 4306378c4ac5a72d19f3f1cbbe67efcaab031dddc4d3c15f5551118b0a1e16aba953e0ae53c5ba86ca4cdff761a8569a2d6dafcb593a997b48cc21457e21ac6d SHA512 66116828646a67efc4c0736972b9245136ac8be60f86e0a339ce583161acee01c022ff8f776911866c13307ccc42ad5aa69ae0b4c309e3a2d89bace22143483b
+AUX R-4.2.2-parallel-rmath-h-install.patch 1193 BLAKE2B 20435abe07a9afd81f6c313fff093a3a18c5da025d0f398cee93e95589e10f42562367790285d7b0dc77f9f8af8680ed199c44fa23e9bd693f0de5a01a918895 SHA512 e1445995eaadda3a5ad15e7bd2720fff727fe1ce731381678e07e1d18013533d21beab09881f3400bc7e51323cceef9c17ed05b72b6d5f2342b5b28ffc5a5315
 DIST R-4.2.1.tar.gz 37601544 BLAKE2B b898262a05c92e125c36a661a89be34b1698177832002f7aa21ccfcf0b30a06481e2154eea9e77a94b1ad8ca35c7bc4aead2be99b862dca7450acee1bec6a99f SHA512 c1baf46d22304c425dde79301183f80f99f2752300137b0b6f902c3e55e2419d5e9185c97de6e3c840a38f6345a6c334aa24161656d4a7f6fa01570390f1122f
 DIST R-4.2.2.tar.gz 33987014 BLAKE2B 083d07b055308451e32133d378abc4aea7dd6da341554dca96ed5863fe2bc937aa3faa94bbd8d3620d3e6e020f806975cbc375ca28c599bd645267b97b2a49d4 SHA512 abbf1c7d016f8e1a9a0c4ad5dee2509a164449da34729f3e98d99ad8678ab398005fb8ed20288d4a6ed1e46ad4c70ad246f31a1a07aab99ba8fc6a5f02e1a309
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-4.2.1.ebuild 7216 BLAKE2B 2aaa42ab58b3408d544d6902ae4629a473aacf04802474296aad08a4c489cfa3312ca7a4464b3679f6670015356d0a54a1a0d9e55dcaf53638a0c9a3ae89e158 SHA512 7100728db02324e66ca3d2b7c597abdeddedabfde503dd62770dfc1912b9eff0f6dc3ace463fbab5c9141d5fb8ba303ee0dab200cdcdd82df8d9940cad8923be
-EBUILD R-4.2.2.ebuild 7150 BLAKE2B 9b25ea4cf87b6b5c5644a664e69bdb9fe29ac561d50a394ef5ffa81a21a71e779e97f432f7410cd34d36e84aaafdf3dfa092d5b5032ac5a90868cc129929023a SHA512 b4547e36f6315d1aaae6ef6c453f7a57733825e1d3b25a656053293ed5ce042a697f330fc79bd8a5c4e871c23d5f0ce2c9ac36a9830fe12681e5e183b0ab189b
+EBUILD R-4.2.2.ebuild 7200 BLAKE2B edcf60c6914e5a79e1cac362e9e14c0979e934696f14d83afd47c1a960425b70d348f8e39504ebf95ab5686603cd481acf9bfe154591de9c3391dbeceb0d071e SHA512 099225f5dc8b884c1a57cf53e7446630fc4eff1d8dd2dde01ce52a16466f1578ec5e53128889de549c206e428813209e451477f92191268100e079dc3d94caf9
 MISC metadata.xml 1344 BLAKE2B c47085197e990eecc6d316980dddcd2f6b2a5f5cfeae4a92b2de2ee5733de56f1aaa182f0c4e8b1b62207518123b60150685edb2ee5b734098121f09e6d963f6 SHA512 d959b84becffe57ac8d49aef9d2d7a294a7428972a8e4e438e26f99c09b4515db3723a09f7a75a6c5649c5cff38898fa13d2f894181060a8eaff1ee4a12dd07d
diff --git a/dev-lang/R/R-4.2.2.ebuild b/dev-lang/R/R-4.2.2.ebuild
index b1adfb0f9f9a..3d3cbf497f10 100644
--- a/dev-lang/R/R-4.2.2.ebuild
+++ b/dev-lang/R/R-4.2.2.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
 	"${FILESDIR}"/R-3.6.2-no-gzip-doc.patch
 	"${FILESDIR}"/R-4.2.2-browser-pdf-prefs.patch
 	"${FILESDIR}"/R-4.2.2-isspace-without-readline.patch
+	"${FILESDIR}/"R-4.2.2-parallel-rmath-h-install.patch
 )
 
 pkg_pretend() {
@@ -178,7 +179,7 @@ src_compile() {
 
 src_install() {
 	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
+	emake -C src/nmath/standalone DESTDIR="${D}" install
 
 	if use doc; then
 		emake DESTDIR="${D}" install-info install-pdf
diff --git a/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch b/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch
new file mode 100644
index 000000000000..756ec8ff5428
--- /dev/null
+++ b/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch
@@ -0,0 +1,23 @@
+From ee1428e77095e52a7396fa7b455f63b7c5b9495b Mon Sep 17 00:00:00 2001
+From: kalibera <kalibera@00db46b3-68df-0310-9c12-caf00c1e9a41>
+Date: Tue, 27 Dec 2022 11:21:33 +0000
+Subject: [PATCH] Declare dependency to ensure include dir exists (PR#17743).
+
+git-svn-id: https://svn.r-project.org/R/trunk@83504 00db46b3-68df-0310-9c12-caf00c1e9a41
+---
+ src/nmath/standalone/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nmath/standalone/Makefile.in b/src/nmath/standalone/Makefile.in
+index 68b45006155..946795a0439 100644
+--- a/src/nmath/standalone/Makefile.in
++++ b/src/nmath/standalone/Makefile.in
+@@ -151,7 +151,7 @@ install-strip: installdirs install-header install-pc
+ 	fi
+ 	@!(test -f libRmath.a) || $(SHELL) $(top_srcdir)/tools/copy-if-change libRmath.a $(DESTDIR)$(libdir)/libRmath.a
+ 
+-install-header:
++install-header: installdirs
+ 	@(cd ../../include; $(MAKE) Rmath.h)
+ @WANT_R_FRAMEWORK_FALSE@	@$(SHELL) $(top_srcdir)/tools/copy-if-change ../../include/Rmath.h $(DESTDIR)$(includedir)/Rmath.h
+ @WANT_R_FRAMEWORK_TRUE@	@$(SHELL) $(top_srcdir)/tools/copy-if-change ../../include/Rmath.h $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/include/Rmath.h