gentoo auto-resync : 01:09:2022 - 19:24:10

3 files changed, 2 insertions, 260 deletions

diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index cb68b76c6270..7614b8ce0a65 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -2,9 +2,7 @@ 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
-DIST R-4.2.0.tar.gz 37585694 BLAKE2B 5ba4d3b9397e92b72af729d88ff562655e0dd7c547bd371638aa76d4f1701f4f8a7911d500cf4f10d87b62457f8f8ce7a946d893477ceb7268b06bd59bc10f3d SHA512 99e71dad00b63e44bfcb8dc9539ff1951809112882d9ee7e06a4e99bce2e6ceac24e8348fd598c21e6d5ab0e0629a85170cde208bfa8145af91c398ac4ef7bcd
 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.0.ebuild 7338 BLAKE2B 21b5f57bd6e00c4c7eb3f086d7566c4699f549c62e243c5de1044b0ed9349f911ca78c50a133c6e1c1f77c69f8f2c19a7ab9892aa0c1a68308a051096e9a6114 SHA512 dcf2ddb27f6ab783c3f828e6f5a07ea8e71130734f7f500b2ffdd8c72b72dea10df37ffb38756e8af7bb6b20ec66743cf82568d5095d2e684ebff5d1d0e686d3
-EBUILD R-4.2.1.ebuild 7330 BLAKE2B 20a721ed849a68d384dbeb4b897ca262f4ceafcd0af378910f5f2ea372b3cae683cebd7fc03316ae8d905d3cab83b2b87c4b7885e2892bc57ce088abd358c7b3 SHA512 423da522661102577f1341c62db17ee0d70c108e3a328e2c35ac79949997c0ac6da6c99f3edd6a9ce8fdf54a6d666cd365017fcb64025b802b5722b7ba3ffec3
+EBUILD R-4.2.1.ebuild 7329 BLAKE2B 82f654565aca7ae8cfcdf8a0c4a09c70ca524652972868ec3c06db357913bc4d3359333636bca217923d236ab5fce5de2d1c277b0ee90ef89862e8bf2ae8f07f SHA512 fdf0747feb6c35ec1a3a094be99d031b9a29700eae0d28df94c7d1b9ade7f0ad6033ea105d807f8e95ea0c533543f3763e02b86aed6e27f27f3880eb84fc6855
 MISC metadata.xml 1261 BLAKE2B 468178b60e894bd8dff85ecbf74d10dce61bdb21fc8b61f43d7778dbc345234fc6b5e28c7608534d558c95fa6583b5acd2e55cef7096c4cff88e84776e93e03a SHA512 0d42cb1e3b951e3b1cbf09e6e48d47cf7635c8b16708b5b1edb6c5d1b422cad2f16ce5c6f7c603efb365eb9d5b794d2d2653b408147aa9e921cd57feb3840013
diff --git a/dev-lang/R/R-4.2.0.ebuild b/dev-lang/R/R-4.2.0.ebuild
deleted file mode 100644
index cf1c175b7af2..000000000000
--- a/dev-lang/R/R-4.2.0.ebuild
+++ /dev/null
@@ -1,256 +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).
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)
-	test? ( virtual/latex-base )"
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	app-text/ghostscript-gpl
-	dev-libs/libpcre2:=
-	>=dev-libs/tre-0.8.0_p20210321[approx]
-	net-libs/libtirpc
-	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:= )
-	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:* )"
-
-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
-)
-
-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"
-
-	# 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)"
-
-	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.1.ebuild b/dev-lang/R/R-4.2.1.ebuild
index 281c8e03d09f..cfb2a07ff6bc 100644
--- a/dev-lang/R/R-4.2.1.ebuild
+++ b/dev-lang/R/R-4.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 sparc ~x86 ~amd64-linux ~x86-linux"
+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="