gentoo auto-resync : 11:05:2023 - 11:46:23

8 files changed, 11 insertions, 315 deletions

diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 276f3f98ca7b..95781c869c57 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,17 +1,13 @@
-AUX R-3.4.1-parallel.patch 487 BLAKE2B bb596d66fab359511c6364ac06cbbe311decd3201292c55e3350e1fc3639c36049c88b1e90adf132da67e1835b646d882415559716727e62217b1c1c679711f0 SHA512 6bc59ebd6c0599110218a70a03030877df8a7fb70d17204a365330d9aa71f7b0688a2502c64b341c478061041da43eb0b0d08cfe63e3e394236142c7d148d778
-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
+AUX R-3.4.1-parallel.patch 415 BLAKE2B e996c72c167b529765c82c8880bc3ea704d3c6e34b7fe09dff4fa93a8e42f8551dc723f44e0ab0638de84ce0f7fa60d4476e297d06eb3d6070d8daf5f79b9dba SHA512 6d36a2eb5df1ec8fa4230bfbc693cf53c95b41bb9269cfa473cfaa6dc8a42681e81a006f03278b86e8636e904bba188f2475d27d06599fdab86de8743401f5be
+AUX R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch 380 BLAKE2B db9fcf9d0c73aa5352110bc27f5881db4f793c963e8f9d46b8681101eb7e062f5f1bf50fd06c53aa392994cd455f6d8cffc680f81a06487694c860297e5e06b6 SHA512 380c6489520c60016cef730822ff973a63460b40726b6c84a9c4ba69d75f93bc8eeb6c45dbb64bcb3277fe2ffd8b1d1fcc40ae668d77269acb4fbc5babdb686e
+AUX R-3.6.2-no-gzip-doc.patch 354 BLAKE2B 81f20b830ac99494a921b635a0d280dd90045c7dd3d1ed02f1fbf46a717ec3b13e7c730c9d4c87dd8d55d5f366db1a60671718511852d134f8dc91fddfbb8505 SHA512 f3f7bd438eac7637b969206c5134f0638ca79c862a6d432545b126422903248e5badde5ff893b4f44e14104734419372c2414380034d17748001f0dfadb5c7b0
 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
 AUX R-4.2.3-curl-8.patch 1796 BLAKE2B ee18b8f00f5adac4583834a257799652b167c7fa63085b5b0a2acc7d17dbd12e1edb20203a539e6dd251a2714f5d87c633d8b825878ed61ae825c0663fcec28f SHA512 c308bde341967e0f85667732cf0d1d4625d8f387df367320febce68d7e4a427340c14857b18e4d777095966729dfc7a2540d3a93161bcd4b5e65b895a47502bb
-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-4.2.3.tar.gz 34010655 BLAKE2B 688403c693de348bdc404c0ebc2df08d3415db216f6017beca8c0408dc70830239ba26ff89f020a249c8af6471363ed742f52c816da84aac8161ec4a522df405 SHA512 060bb4e1d1f1a5a0383a3b4372ac9247c0a20285020da17cebeb40ddc54da12d5f369ea243ea04d2c6970986fe22b3f9c37fbdfb3405cd8aa4f2353091ea9c5c
+DIST R-4.3.0.tar.gz 34821768 BLAKE2B 3505c8357419355fddb8aadbf0952c492e3e38d649d6261478d6187c94ff71110089ec0933a31dd2f7258e58a1d0864a68cb4d7b6cdefc54e5add55d0d62db10 SHA512 7f9bc8360818d7fdf05e26a4213df01468669514a4c2ad62dee358f53dcfa05a71ee72241db91fed59574c26d7caee5d3e0717637e1666daec99446e42c07813
 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 7207 BLAKE2B 9f39262165aef3b16147413a0247811d0ade7928cdc782eaa836da3687d11bd6c3ac10d83f31fa84ad456e969f2c7620b54ca7e542cf3a108ac573d2b8dc367f SHA512 bab1ea536c51b2a3e738dbd49d26dc38b978581ced9882e67c88fc1dbbfb6ed8e11b283fbd87c7459ab068db8c8a6982064df7f16985072236e9da9840306901
 EBUILD R-4.2.3.ebuild 7197 BLAKE2B 35806db3670bbe2a28f1877c2b6d9e0cb94d356c39921ef658fcf9e1db6c976369921d2730b49d905aa7971818ffa6f1d32038c30644ebfca9b3e5cca92a5cd0 SHA512 c7783bc2ac41c1ecd84b6cfcd6ee711298588fb365b02995875110c9f49885a9443672b2afb83744552ea7f504019f0e266bdaaba84f445032373bda81962c3c
+EBUILD R-4.3.0.ebuild 7010 BLAKE2B 0a2aeac841bbb2b887a2bf7e03753b708702fb265fb8d7ce600e66dc5b58739201bd807a6f7168ba697014f4a1c8a5b0af3044953a7ff4cdd4b99ec606f3c767 SHA512 c60d0694eec7b3806c90c2cfeec564fc78ce7d27d46ce3cabd85870f2b8ab00552467ec36046ec2effd2eccbbe75937336f14dbed03c52523b01875f0f46f757
 MISC metadata.xml 1344 BLAKE2B c47085197e990eecc6d316980dddcd2f6b2a5f5cfeae4a92b2de2ee5733de56f1aaa182f0c4e8b1b62207518123b60150685edb2ee5b734098121f09e6d963f6 SHA512 d959b84becffe57ac8d49aef9d2d7a294a7428972a8e4e438e26f99c09b4515db3723a09f7a75a6c5649c5cff38898fa13d2f894181060a8eaff1ee4a12dd07d
diff --git a/dev-lang/R/R-4.2.1.ebuild b/dev-lang/R/R-4.2.1.ebuild
deleted file mode 100644
index 0fda9d9aacd0..000000000000
--- a/dev-lang/R/R-4.2.1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
-
-# latest git commit for R bash completion: https://github.com/deepayan/rcompletion
-BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6
-
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="https://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-4/${P}.tar.gz
-	https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
-
-REQUIRED_USE="
-	png? ( || ( cairo X ) )
-	jpeg? ( || ( cairo X ) )
-	tiff? ( || ( cairo X ) )"
-RESTRICT="
-	minimal? ( test )
-	!test? ( test )"
-
-# At least one package installation in the test suite requires TeX,
-# and will fail without it (bug #718056).
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	app-text/ghostscript-gpl
-	dev-libs/libpcre2:=
-	>=dev-libs/tre-0.8.0_p20210321[approx]
-	net-misc/curl
-	virtual/blas
-	sys-libs/zlib[minizip]
-	|| (
-		sys-apps/coreutils
-		app-misc/realpath
-	)
-	cairo? (
-		x11-libs/cairo:=[X=]
-		x11-libs/pango:=
-	)
-	icu? ( dev-libs/icu:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	kernel_linux? ( net-libs/libtirpc )
-	lapack? ( virtual/lapack )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:= )
-	readline? ( sys-libs/readline:= )
-	tiff? ( media-libs/tiff:= )
-	tk? ( dev-lang/tk:= )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xdg-utils
-	)"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)
-	test? ( virtual/latex-base )"
-
-PATCHES=(
-	"${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() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	# avoid using existing R installation
-	unset R_HOME
-}
-
-src_prepare() {
-	default
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		-i src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (gentoo bug #221061)
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EPREFIX}/usr/$(get_libdir)/${PN}\"':" \
-		-i src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -e 's:\.\./manual/:manual/:g' \
-		-i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack &&
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl &&
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-
-	# Fix for Darwin (macOS)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-e "/SHLIB_EXT/s/\.so/.dylib/" \
-				-i configure.ac || die
-			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EPREFIX}/usr/$(get_libdir)/libRmath.dylib:" \
-				-i src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EPREFIX}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	filter-ldflags -Wl,-Bdirect -Bdirect
-
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--disable-R-static-lib \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-system-tre \
-		$(use_enable java) \
-		$(use_enable lto lto R) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with tk tk-config "${ESYSROOT}"/usr/$(get_libdir)/tkConfig.sh) \
-		$(use_with tk tcl-config "${ESYSROOT}"/usr/$(get_libdir)/tclConfig.sh) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone shared AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	newenvd - 99R <<-_EOF_
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}/lib"
-		R_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	_EOF_
-
-	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
-	# The buildsystem has a different understanding of install_names than
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/$(get_libdir)/R >/dev/null || die
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" "${mod}"
-		done
-		popd >/dev/null || die
-	fi
-
-	# Users are encouraged to access some of the the R documentation
-	# interactively, through functions like "contributors()" that
-	# tries to open the "AUTHORS" file. Other files can be accessed
-	# by name with RShowDoc(), and the documentation for e.g. license()
-	# and RShowDoc() suggests a few of these names. Here we try to
-	# collect as many names as possible that a user might actually
-	# try to view through R, because if we don't decompress them,
-	# then R doesn't know what to do with 'em. Bug #556706.
-	local INTERACTIVE_DOCS=(
-		AUTHORS
-		COPYING
-		FAQ
-		NEWS
-		THANKS
-	)
-
-	# Other data sources that are shipped as "documentation," but which
-	# need to be accessible via their original unmolested filenames.
-	local INTERACTIVE_DATA=(
-		BioC_mirrors.csv
-		CRAN_mirrors.csv
-		KEYWORDS.db
-		NEWS.rds
-	)
-
-	local f NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
-	for f in "${NOCOMPRESS_DOCS[@]}"; do
-		docompress -x /usr/share/doc/${PF}/${f}
-	done
-
-	# Finally, an extra copy of this started showing up at some point...
-	rm "${ED}"/usr/$(get_libdir)/R/COPYING || die
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-4.2.2.ebuild b/dev-lang/R/R-4.3.0.ebuild
index 0ccb36ebf04c..974d22709605 100644
--- a/dev-lang/R/R-4.2.2.ebuild
+++ b/dev-lang/R/R-4.3.0.ebuild
@@ -72,12 +72,8 @@ BDEPEND="
 
 PATCHES=(
 	"${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.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() {
diff --git a/dev-lang/R/files/R-3.4.1-parallel.patch b/dev-lang/R/files/R-3.4.1-parallel.patch
index 6fac15b9ffb7..95acc4790ebb 100644
--- a/dev-lang/R/files/R-3.4.1-parallel.patch
+++ b/dev-lang/R/files/R-3.4.1-parallel.patch
@@ -1,5 +1,5 @@
---- a/src/include/Makefile.in	2017-07-05 23:09:09.682703655 +0000
-+++ b/src/include/Makefile.in	2017-07-05 23:06:56.533612308 +0000
+--- a/src/include/Makefile.in
++++ b/src/include/Makefile.in
 @@ -81,7 +81,7 @@
  Rmath.h0: $(srcdir)/Rmath.h0.in $(top_builddir)/config.status
  	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
diff --git a/dev-lang/R/files/R-3.4.1-rmath-shared.patch b/dev-lang/R/files/R-3.4.1-rmath-shared.patch
deleted file mode 100644
index 8bc6233de6df..000000000000
--- a/dev-lang/R/files/R-3.4.1-rmath-shared.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/nmath/standalone/Makefile.in	2017-07-05 23:20:26.098087600 +0000
-+++ b/src/nmath/standalone/Makefile.in	2017-07-05 23:21:55.087480310 +0000
-@@ -64,7 +64,8 @@
- Rexeclibdir_LTLIBRARIES = $(libRmath_la)
- libRmath_la_SOURCES = $(SOURCES)
- libRmath_la_OBJECTS = $(OBJECTS:.o=.lo)
--libRmath_la_LDFLAGS =
-+libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so
-+libRmath_la_LIBADD = $(LIBM)
- 
- CLEANFILES = Makedeps *.d *.o *.lo test check.log $(SOURCES)
- DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
-@@ -127,7 +128,7 @@
- 
- ## under peculiar circumstances, $(LIBM) here helps.
- $(libRmath_la): $(libRmath_la_OBJECTS)
--	$(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(LIBM)
-+	$(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@
- 
- test: $(srcdir)/test.c
- 	$(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \
diff --git a/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch b/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
index 2bcf50ccadb2..c36e59ec37e7 100644
--- a/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
+++ b/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
@@ -1,5 +1,5 @@
---- R-3.6.2-orig/src/unix/Makefile.in	2019-03-29 10:02:31.000000000 +1100
-+++ R-3.6.2/src/unix/Makefile.in	2020-01-13 22:39:14.506804106 +1100
+--- a/src/unix/Makefile.in
++++ b/src/unix/Makefile.in
 @@ -79,7 +79,7 @@
  	  -e "s:@rincludedir:$(rincludedir):" \
  	  -e "s:@rarch:$(R_ARCH):" \
diff --git a/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch b/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch
index c87b61780529..49fbecc3a641 100644
--- a/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch
+++ b/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch
@@ -1,5 +1,5 @@
---- R-3.6.2-orig/doc/manual/Makefile.in	2019-03-29 10:02:40.000000000 +1100
-+++ R-3.6.2/doc/manual/Makefile.in	2020-01-13 22:17:31.324967094 +1100
+--- a/doc/manual/Makefile.in
++++ b/doc/manual/Makefile.in
 @@ -345,7 +345,6 @@
  	@$(ECHO) "installing R info pages ..."
  	@for f in $(OBJECTS_INFO:.info=.info*); do \
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
deleted file mode 100644
index f5fe9667ad67..000000000000
--- a/dev-lang/R/files/R-4.2.1-reg-packages-testfix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 {