summaryrefslogtreecommitdiff
path: root/dev-lang
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/Manifest.gzbin19514 -> 19508 bytes
-rw-r--r--dev-lang/R/Manifest14
-rw-r--r--dev-lang/R/R-4.2.3.ebuild248
-rw-r--r--dev-lang/R/R-4.3.0.ebuild9
-rw-r--r--dev-lang/R/files/R-4.2.2-browser-pdf-prefs.patch95
-rw-r--r--dev-lang/R/files/R-4.2.2-isspace-without-readline.patch22
-rw-r--r--dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch23
-rw-r--r--dev-lang/R/files/R-4.2.3-curl-8.patch59
-rw-r--r--dev-lang/R/files/R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch (renamed from dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch)0
-rw-r--r--dev-lang/R/files/R-4.3.0-no-gzip-doc.patch (renamed from dev-lang/R/files/R-3.6.2-no-gzip-doc.patch)0
-rw-r--r--dev-lang/R/files/R-4.3.0-parallel.patch (renamed from dev-lang/R/files/R-3.4.1-parallel.patch)0
-rw-r--r--dev-lang/scala-bin/Manifest2
-rw-r--r--dev-lang/scala-bin/scala-bin-2.13.9.ebuild4
13 files changed, 13 insertions, 463 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d5e118152caf..9d4b83e7586b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 79f6469ef89b..c26e1c289400 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,13 +1,7 @@
-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.3.tar.gz 34010655 BLAKE2B 688403c693de348bdc404c0ebc2df08d3415db216f6017beca8c0408dc70830239ba26ff89f020a249c8af6471363ed742f52c816da84aac8161ec4a522df405 SHA512 060bb4e1d1f1a5a0383a3b4372ac9247c0a20285020da17cebeb40ddc54da12d5f369ea243ea04d2c6970986fe22b3f9c37fbdfb3405cd8aa4f2353091ea9c5c
+AUX R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch 380 BLAKE2B db9fcf9d0c73aa5352110bc27f5881db4f793c963e8f9d46b8681101eb7e062f5f1bf50fd06c53aa392994cd455f6d8cffc680f81a06487694c860297e5e06b6 SHA512 380c6489520c60016cef730822ff973a63460b40726b6c84a9c4ba69d75f93bc8eeb6c45dbb64bcb3277fe2ffd8b1d1fcc40ae668d77269acb4fbc5babdb686e
+AUX R-4.3.0-no-gzip-doc.patch 354 BLAKE2B 81f20b830ac99494a921b635a0d280dd90045c7dd3d1ed02f1fbf46a717ec3b13e7c730c9d4c87dd8d55d5f366db1a60671718511852d134f8dc91fddfbb8505 SHA512 f3f7bd438eac7637b969206c5134f0638ca79c862a6d432545b126422903248e5badde5ff893b4f44e14104734419372c2414380034d17748001f0dfadb5c7b0
+AUX R-4.3.0-parallel.patch 415 BLAKE2B e996c72c167b529765c82c8880bc3ea704d3c6e34b7fe09dff4fa93a8e42f8551dc723f44e0ab0638de84ce0f7fa60d4476e297d06eb3d6070d8daf5f79b9dba SHA512 6d36a2eb5df1ec8fa4230bfbc693cf53c95b41bb9269cfa473cfaa6dc8a42681e81a006f03278b86e8636e904bba188f2475d27d06599fdab86de8743401f5be
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.3.ebuild 7198 BLAKE2B 62c47daea550f16633d5dc89d2cbaee3c5b72bd3cbc0e358e1c05b18c93ec4107c315c95de1a14ceaa556e5da405c0b0042abbaca55bc76df56e7e4690b5a7a2 SHA512 ded98d0aa2eb7f361b91718ce67ef5fb8cba0c8b1dcd2aec4952cf604c5b9b40fcfa10d87e0ba2a351f81216f6bef65a945b5bdea6c095041521e94b7a6ed8ad
-EBUILD R-4.3.0.ebuild 7007 BLAKE2B 5b179b73c190a04a80a77eb9da1f94bc2e9c92bd81d85c6d97d71dd9786bf9da33198afe0d8ee018e8430f04435b6699d00bdcce7e6e861db75dcf115ae88f62 SHA512 bff6c765bb449ae8e7ebf77e8731737ed313155ff25dfdf8ac7da233eccdc81ba479841ec611ca9ccf2974888de6f4b3e96496858596a2599eb39fbc3b794714
+EBUILD R-4.3.0.ebuild 7103 BLAKE2B 5c188c762bfd37c676f563b125937c5751c7072d9015f4baa9969deee7533f12239df2de4dfb4357073420d98fab06045ddaaf9cca490b537dca2e20c7d94a34 SHA512 541259d1f53aa8b2e97581971bf87de2b60f6bdedeb87d65a92dd89c6cdf605b7fc63b812131ed71478d67035b4529c49b8f8ceb1a02d643b4e43339a63ecab0
MISC metadata.xml 1344 BLAKE2B c47085197e990eecc6d316980dddcd2f6b2a5f5cfeae4a92b2de2ee5733de56f1aaa182f0c4e8b1b62207518123b60150685edb2ee5b734098121f09e6d963f6 SHA512 d959b84becffe57ac8d49aef9d2d7a294a7428972a8e4e438e26f99c09b4515db3723a09f7a75a6c5649c5cff38898fa13d2f894181060a8eaff1ee4a12dd07d
diff --git a/dev-lang/R/R-4.2.3.ebuild b/dev-lang/R/R-4.2.3.ebuild
deleted file mode 100644
index 9f94b563f46b..000000000000
--- a/dev-lang/R/R-4.2.3.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2023 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 ~loong 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
- )"
-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.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
- "${FILESDIR}"/R-4.2.3-curl-8.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)"
-
- 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 -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.3.0.ebuild b/dev-lang/R/R-4.3.0.ebuild
index ca6b74443472..54725bb77495 100644
--- a/dev-lang/R/R-4.3.0.ebuild
+++ b/dev-lang/R/R-4.3.0.ebuild
@@ -71,11 +71,14 @@ BDEPEND="
test? ( virtual/latex-base )"
PATCHES=(
- "${FILESDIR}"/R-3.4.1-parallel.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.3.0-parallel.patch
+ "${FILESDIR}"/R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch
+ "${FILESDIR}"/R-4.3.0-no-gzip-doc.patch
)
+# false positive, the linking step fails (as it should)
+QA_CONFIG_IMPL_DECL_SKIP=( iconvlist )
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
diff --git a/dev-lang/R/files/R-4.2.2-browser-pdf-prefs.patch b/dev-lang/R/files/R-4.2.2-browser-pdf-prefs.patch
deleted file mode 100644
index b5a953cb6057..000000000000
--- a/dev-lang/R/files/R-4.2.2-browser-pdf-prefs.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6e48ab8b5006f3fdd8ef08f3f86406a02eabdc80 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 12 Sep 2022 08:31:46 -0400
-Subject: [PATCH 1/3] m4/R.m4: prefer xdg-open for R_BROWSER and R_PDFVIEWER.
-
-The xdg-open utility (if it is present) will launch the user's
-preferred browsr or PDF viewer when fed an HTML page or a PDF
-document, respectively. It therefore makes sense to prefer it over
-(for example) firefox, which may be installed but not the user's
-preferred browser.
----
- m4/R.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/m4/R.m4 b/m4/R.m4
-index bdcfbea..c5052e7 100644
---- a/m4/R.m4
-+++ b/m4/R.m4
-@@ -237,7 +237,7 @@ fi])
- ## xdg-open is the freedesktop.org interface to kfmclient/gnome-open
- AC_DEFUN([R_PROG_BROWSER],
- [if test -z "${R_BROWSER}"; then
-- AC_PATH_PROGS(R_BROWSER, [firefox mozilla galeon opera xdg-open kfmclient gnome-moz-remote open])
-+ AC_PATH_PROGS(R_BROWSER, [xdg-open firefox mozilla galeon opera kfmclient gnome-moz-remote open])
- fi
- if test -z "${R_BROWSER}"; then
- warn_browser="I could not determine a browser"
-@@ -255,7 +255,7 @@ AC_SUBST(R_BROWSER)
- ## the FreeBSD acroread port.
- AC_DEFUN([R_PROG_PDFVIEWER],
- [AC_PATH_PROGS(R_PDFVIEWER,
-- [${R_PDFVIEWER} acroread acroread4 xdg-open evince xpdf gv gnome-gv ggv okular kpdf open gpdf kghostview])
-+ [${R_PDFVIEWER} xdg-open acroread acroread4 evince xpdf gv gnome-gv ggv okular kpdf open gpdf kghostview])
- if test -z "${R_PDFVIEWER}"; then
- warn_pdfviewer="I could not determine a PDF viewer"
- AC_MSG_WARN([${warn_pdfviewer}])
---
-2.35.1
-
-From 4e50ed9c976a4422a6d431d3d078164948f26bda Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 12 Sep 2022 08:36:41 -0400
-Subject: [PATCH 2/3] m4/R.m4: add epiphany, lynx, and links to the R_BROWSER
- search list.
-
-The epiphany browser is today one of the more popular ones, being the
-"official" GNOME browser. And lynx and links are nice text-based
-fallbacks.
----
- m4/R.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m4/R.m4 b/m4/R.m4
-index c5052e7..e99b0f9 100644
---- a/m4/R.m4
-+++ b/m4/R.m4
-@@ -237,7 +237,7 @@ fi])
- ## xdg-open is the freedesktop.org interface to kfmclient/gnome-open
- AC_DEFUN([R_PROG_BROWSER],
- [if test -z "${R_BROWSER}"; then
-- AC_PATH_PROGS(R_BROWSER, [xdg-open firefox mozilla galeon opera kfmclient gnome-moz-remote open])
-+ AC_PATH_PROGS(R_BROWSER, [xdg-open firefox mozilla epiphany galeon opera kfmclient gnome-moz-remote open lynx links])
- fi
- if test -z "${R_BROWSER}"; then
- warn_browser="I could not determine a browser"
---
-2.35.1
-
-From 719294ed2548f79ab6a5861662716d853284f4d7 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 12 Sep 2022 08:38:03 -0400
-Subject: [PATCH 3/3] m4/R.m4: add atril to the R_PDFVIEWER list.
-
-Atril is the PDF viewer for the MATE desktop, essentially a fork of
-the gnome-2.x evince viewer.
----
- m4/R.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m4/R.m4 b/m4/R.m4
-index e99b0f9..7e04ced 100644
---- a/m4/R.m4
-+++ b/m4/R.m4
-@@ -255,7 +255,7 @@ AC_SUBST(R_BROWSER)
- ## the FreeBSD acroread port.
- AC_DEFUN([R_PROG_PDFVIEWER],
- [AC_PATH_PROGS(R_PDFVIEWER,
-- [${R_PDFVIEWER} xdg-open acroread acroread4 evince xpdf gv gnome-gv ggv okular kpdf open gpdf kghostview])
-+ [${R_PDFVIEWER} xdg-open acroread acroread4 evince atril xpdf gv gnome-gv ggv okular kpdf open gpdf kghostview])
- if test -z "${R_PDFVIEWER}"; then
- warn_pdfviewer="I could not determine a PDF viewer"
- AC_MSG_WARN([${warn_pdfviewer}])
---
-2.35.1
-
diff --git a/dev-lang/R/files/R-4.2.2-isspace-without-readline.patch b/dev-lang/R/files/R-4.2.2-isspace-without-readline.patch
deleted file mode 100644
index 0b32bef1352b..000000000000
--- a/dev-lang/R/files/R-4.2.2-isspace-without-readline.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6e36141598b78add7fb841480260b0a57ae79330 Mon Sep 17 00:00:00 2001
-From: smeyer <smeyer@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 26 Oct 2022 08:22:41 +0000
-Subject: [PATCH] avoid implicit declaration of 'isspace' --without-readline
-
-git-svn-id: https://svn.r-project.org/R/trunk@83178 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/unix/sys-std.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/unix/sys-std.c b/src/unix/sys-std.c
-index 7b93d63884a..f95ff0cf7b3 100644
---- a/src/unix/sys-std.c
-+++ b/src/unix/sys-std.c
-@@ -1339,6 +1339,7 @@ Rstd_ShowFiles(int nfile, /* number of files */
- */
-
-
-+#include <ctype.h> /* for isspace */
-
- int attribute_hidden Rstd_ChooseFile(int _new, char *buf, int len)
- {
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
deleted file mode 100644
index 756ec8ff5428..000000000000
--- a/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
diff --git a/dev-lang/R/files/R-4.2.3-curl-8.patch b/dev-lang/R/files/R-4.2.3-curl-8.patch
deleted file mode 100644
index 92ee3b0d5702..000000000000
--- a/dev-lang/R/files/R-4.2.3-curl-8.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/902993
-
---- a/configure
-+++ b/configure
-@@ -48533,7 +48533,7 @@
- done
-
- if test "x${have_libcurl}" = "xyes"; then
--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl is version 7 and >= 7.28.0" >&5
-+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl is version 7 and >= 7.28.0 or version 8" >&5
- printf %s "checking if libcurl is version 7 and >= 7.28.0... " >&6; }
- if test ${r_cv_have_curl728+y}
- then :
-@@ -48551,8 +48551,10 @@
- int main(int argc, const char * argv[])
- {
- #ifdef LIBCURL_VERSION_MAJOR
--#if LIBCURL_VERSION_MAJOR > 7
-+#if LIBCURL_VERSION_MAJOR > 8
- exit(1);
-+#elif LIBCURL_VERSION_MAJOR == 8
-+ exit(0);
- #elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
- exit(0);
- #else
---- a/m4/R.m4
-+++ b/m4/R.m4
-@@ -4300,15 +4300,17 @@
- AC_CHECK_HEADERS(curl/curl.h, [have_libcurl=yes], [have_libcurl=no])
-
- if test "x${have_libcurl}" = "xyes"; then
--AC_CACHE_CHECK([if libcurl is version 7 and >= 7.28.0], [r_cv_have_curl728],
-+AC_CACHE_CHECK([if libcurl is version 7 and >= 7.28.0 or verion 8], [r_cv_have_curl728_8],
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdlib.h>
- #include <curl/curl.h>
- int main(int argc, const char * argv[])
- {
- #ifdef LIBCURL_VERSION_MAJOR
--#if LIBCURL_VERSION_MAJOR > 7
-+#if LIBCURL_VERSION_MAJOR > 8
- exit(1);
-+#elif LIBCURL_VERSION_MAJOR == 8
-+ exit(0);
- #elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
- exit(0);
- #else
-@@ -4318,9 +4320,9 @@
- exit(1);
- #endif
- }
--]])], [r_cv_have_curl728=yes], [r_cv_have_curl728=no], [r_cv_have_curl728=no])])
-+]])], [r_cv_have_curl728_8=yes], [r_cv_have_curl728_8=no], [r_cv_have_curl728_8=no])])
- fi
--if test "x${r_cv_have_curl728}" = xno; then
-+if test "x${r_cv_have_curl728_8}" = xno; then
- have_libcurl=no
- fi
-
diff --git a/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch b/dev-lang/R/files/R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch
index c36e59ec37e7..c36e59ec37e7 100644
--- a/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
+++ b/dev-lang/R/files/R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch
diff --git a/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch b/dev-lang/R/files/R-4.3.0-no-gzip-doc.patch
index 49fbecc3a641..49fbecc3a641 100644
--- a/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch
+++ b/dev-lang/R/files/R-4.3.0-no-gzip-doc.patch
diff --git a/dev-lang/R/files/R-3.4.1-parallel.patch b/dev-lang/R/files/R-4.3.0-parallel.patch
index 95acc4790ebb..95acc4790ebb 100644
--- a/dev-lang/R/files/R-3.4.1-parallel.patch
+++ b/dev-lang/R/files/R-4.3.0-parallel.patch
diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index d9c7ca0951e9..0b2d05a07869 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,5 +1,5 @@
DIST scala-2.13.6.tgz 23407489 BLAKE2B b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70 SHA512 445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188
DIST scala-2.13.9.tgz 23602967 BLAKE2B 93bbee93562143c72a4bdcfa3e7a8257064474cf38a2de448444bc5639f54e0ef17b9361e7144b39b3040b97683c2674bcc7611fc770c2fa985d9d0d9fd403d3 SHA512 da808ea65fe66c83dc55873662de92647675a2da15b87fb719f1c76d29588f725a466d8519c53f4c521d4defc7b66c023e52a6b264c58117f321ddcf50ebd2a6
EBUILD scala-bin-2.13.6.ebuild 1314 BLAKE2B d418046f5d32e02b1f8bec7e0913b36d0c693ac86461da968e1683fb3e003145295e1ac016cde1c420d823de1e030de95fa4b8bb57250be6f1f22f800014a587 SHA512 2b92c6fd821780847b98bd6f557b24bacbc3f598e859366391cf0c69efbae4af4f09b6cc5c44d3a54f749299f3451699075e040dadc643cf84758cd24858b78c
-EBUILD scala-bin-2.13.9.ebuild 1318 BLAKE2B 4ec933bd6a11a8806ebaca6894ecdd9ecdc58d589355556d2de7e881764cdb0d1b60f6104a6713fb0e67b36e4b960a8fe6af0f345e66e72b7e485230574c8e4c SHA512 f733e7189c1f8aa96843f8c2779e615be7973b9a8bae29e29588e7545facbf90209f5ce913305df9d03b7ae3511c4c76b8db87f87cfe5911048e3e9bbc0c67e5
+EBUILD scala-bin-2.13.9.ebuild 1316 BLAKE2B f69035d4446ace380d92c54f14f53d7c6dfcb64da7fc733690a2c48dda42965e38ad95abf8bf5cfb4f78a09e2e245a7826bdcdedaafce51b4e202c83dc257737 SHA512 d4e6a43f2cc09a9b2fe2def515c549e267df2ae3aeaf76ea2e6ec4c24038f02b97afeb4b9252d817210bee06719f559ed57b923ef5fb0f2748b29976be81bc44
MISC metadata.xml 318 BLAKE2B 86a802cb50a100c38c524852d35f1d8dbf98fd7bee84b09c706cb3ab7e561809cd7e90aea8db93b61621603e571a1f9e9bb187eb009733ad55190c4f34e49863 SHA512 b31204c0b6f796e0e43c10c1721f912d405247619f5ace759a79213405374119224689d37326a8776d2044b96830455820e0ebaab388dc724baca73cac000809
diff --git a/dev-lang/scala-bin/scala-bin-2.13.9.ebuild b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
index 1f9dc34f8e61..595cbbe98dc1 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc"
RDEPEND="
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 07:30:26 +0000