From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7058F158094 for ; Thu, 15 Sep 2022 15:51:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C69EE0905; Thu, 15 Sep 2022 15:51:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 314E3E0905 for ; Thu, 15 Sep 2022 15:51:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23DC0340F15 for ; Thu, 15 Sep 2022 15:51:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 328555D4 for ; Thu, 15 Sep 2022 15:51:14 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1663256974.6162fb237663bbe61114cf13951715c141d51bba.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/R/files/, dev-lang/R/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/R/R-4.2.1.ebuild dev-lang/R/files/R-4.2.1-reg-packages-testfix.patch X-VCS-Directories: dev-lang/R/files/ dev-lang/R/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 6162fb237663bbe61114cf13951715c141d51bba X-VCS-Branch: master Date: Thu, 15 Sep 2022 15:51:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 92edb424-13b9-47c9-8748-2df61b3b2c41 X-Archives-Hash: 2c88c9472a1b63ccddb222ea81a5a739 commit: 6162fb237663bbe61114cf13951715c141d51bba Author: Michael Orlitzky gentoo org> AuthorDate: Thu Sep 15 15:47:56 2022 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Thu Sep 15 15:49:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6162fb23 dev-lang/R: backport a fix for a broken test. This isn't a critical fix by any means, but otherwise we're likely to forget to re-enable this test when R-4.2.2 comes out. Signed-off-by: Michael Orlitzky gentoo.org> dev-lang/R/R-4.2.1.ebuild | 14 +++++------- .../R/files/R-4.2.1-reg-packages-testfix.patch | 25 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dev-lang/R/R-4.2.1.ebuild b/dev-lang/R/R-4.2.1.ebuild index cfb2a07ff6bc..1ee01869a453 100644 --- a/dev-lang/R/R-4.2.1.ebuild +++ b/dev-lang/R/R-4.2.1.ebuild @@ -71,10 +71,11 @@ BDEPEND=" test? ( virtual/latex-base )" 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 + "${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() { @@ -108,11 +109,6 @@ src_prepare() { 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)" 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 new file mode 100644 index 000000000000..f5fe9667ad67 --- /dev/null +++ b/dev-lang/R/files/R-4.2.1-reg-packages-testfix.patch @@ -0,0 +1,25 @@ +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 {