From 52dd10ee7758b63c65a614d4de696749f082c667 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 14 Jan 2025 17:28:19 +0100
Subject: [PATCH] R, revive previous version (#11649)

---
 dev-lang/r/r-4.4.1.recipe | 159 ++++++++++++++++++++++++++++++++++++++
 dev-lang/r/r-4.4.2.recipe |   4 +-
 2 files changed, 161 insertions(+), 2 deletions(-)
 create mode 100644 dev-lang/r/r-4.4.1.recipe

diff --git a/dev-lang/r/r-4.4.1.recipe b/dev-lang/r/r-4.4.1.recipe
new file mode 100644
index 000000000..d7ccafadb
--- /dev/null
+++ b/dev-lang/r/r-4.4.1.recipe
@@ -0,0 +1,159 @@
+SUMMARY="A programming language primarily for statistics and numerical analysis"
+DESCRIPTION="R is GNU S, a system for statistical computation and graphics. \
+It consists of a language plus a run-time environment with graphics, a \
+debugger, access to certain system functions, and the ability to run programs \
+stored in script files. The core of R is an interpreted computer language \
+which allows branching and looping as well as modular programming using \
+functions. The R distribution contains functionality for a large number of \
+statistical procedures such as: linear and generalized linear models, \
+nonlinear regression models, time series analysis, classical parametric and \
+nonparametric tests, clustering, smoothing and graphical data \
+representations. Additional modules ('add-on packages') are available for a \
+variety of specific purposes but are not distributed with this package."
+HOMEPAGE="https://www.r-project.org/"
+COPYRIGHT="2024 The R Foundation for Statistical Computing"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://cloud.r-project.org/src/base/R-4/R-$portVersion.tar.gz"
+CHECKSUM_SHA256="b4cb675deaaeb7299d3b265d218cde43f192951ce5b89b7bb1a5148a36b2d94d"
+SOURCE_DIR="R-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	r$secondaryArchSuffix = $portVersion
+	cmd:r$commandSuffix
+	cmd:rscript$commandSuffix
+	lib:libRmath$secondaryArchSuffix
+	devel:libRmath$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	cmd:less
+	lib:libbz2$secondaryArchSuffix
+#	lib:libcairo$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libgettextpo$secondaryArchSuffix
+	lib:libgfortran$secondaryArchSuffix
+	lib:libgomp$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libicui18n$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:liblapack$secondaryArchSuffix
+	lib:liblzma$secondaryArchSuffix
+	lib:libncursesw$secondaryArchSuffix
+	lib:libopenblas$secondaryArchSuffix
+#	lib:libpango_1.0$secondaryArchSuffix
+	lib:libpaper$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libquadmath$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+#	lib:libtcl8.6
+	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
+	devel:libcairo$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcurl$secondaryArchSuffix
+	devel:libgettextpo$secondaryArchSuffix
+	devel:libgfortran$secondaryArchSuffix
+	devel:libgomp$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libicui18n$secondaryArchSuffix >= 74
+	devel:libintl$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:liblapack$secondaryArchSuffix
+	devel:liblzma$secondaryArchSuffix
+	devel:libncursesw$secondaryArchSuffix
+	devel:libnghttp2$secondaryArchSuffix
+	devel:libopenblas$secondaryArchSuffix
+	devel:libpango_1.0$secondaryArchSuffix
+	devel:libpaper$secondaryArchSuffix >= 2
+	devel:libpcre$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libquadmath$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+#	devel:libtclstub8.6
+	devel:libtiff$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
+	devel:libXmu$secondaryArchSuffix
+	devel:libXt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:gfortran$secondaryArchSuffix
+	cmd:grep
+#	cmd:kpsewhich #texlive
+	cmd:ld$secondaryArchSuffix
+	cmd:less
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+#	cmd:makeindex #texlive
+	cmd:pcre2_config$secondaryArchSuffix
+#	cmd:pdflatex #texlive
+#	cmd:pdftex #texlive
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:pwd
+	cmd:sed
+	cmd:texi2any
+	cmd:which
+	cmd:yacc
+	"
+
+
+BUILD()
+{
+	# From Alpine
+	# Performance is more important than the size of R. Moreover, -O2 has
+	# only minimal impact on the R package size (less then 1%)
+	export CFLAGS="${CFLAGS/-Os/-O2}"
+	export CPPFLAGS="${CPPFLAGS/-Os/-O2} -D_BSD_SOURCE"
+	export CXXFLAGS="${CXXFLAGS/-Os/-O2}"
+	export LIBS="-lnetwork -lbsd"
+
+	runConfigure --omit-dirs "sysconfdir binDir" ./configure \
+		--bindir=$commandBinDir \
+		--sysconfdir="$sysconfDir/R" \
+		--enable-R-shlib \
+		--with-x=no \
+		rdocdir="$docDir" \
+		rincludedir=$includeDir \
+		rsharedir="$dataDir/R"
+
+	make $jobArgs
+	make -C src/nmath/standalone shared $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	make -C src/nmath/standalone shared install
+
+	prepareInstalledDevelLib libRmath
+	fixPkgconfig
+}
+
+TEST()
+{
+	make check
+}
diff --git a/dev-lang/r/r-4.4.2.recipe b/dev-lang/r/r-4.4.2.recipe
index 35824e825..fa4090dde 100644
--- a/dev-lang/r/r-4.4.2.recipe
+++ b/dev-lang/r/r-4.4.2.recipe
@@ -19,8 +19,8 @@ CHECKSUM_SHA256="1578cd603e8d866b58743e49d8bf99c569e81079b6a60cf33cdf7bdffeb817e
 SOURCE_DIR="R-$portVersion"
 PATCHES="r-$portVersion.patchset"
 
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+ARCHITECTURES="!all !x86_gcc2"
+SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
 
 commandBinDir=$binDir
 commandSuffix=$secondaryArchSuffix