[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rcs/, dev-vcs/rcs/files/

2022-01-28 Thread Sam James 
commit: f883293d2cd98ac23ea6b06f2a48172484a33c67
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 29 01:26:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 29 03:56:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f883293d

dev-vcs/rcs: drop 5.9.3, 5.9.4

Signed-off-by: Sam James  gentoo.org>

 dev-vcs/rcs/Manifest|  2 --
 dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch | 24 --
 dev-vcs/rcs/rcs-5.9.3.ebuild| 47 ---
 dev-vcs/rcs/rcs-5.9.4.ebuild| 49 -
 4 files changed, 122 deletions(-)

diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 34695ca2a700..da8459ef7e57 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,3 +1 @@
 DIST rcs-5.10.0.tar.xz 890872 BLAKE2B 
32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba
 SHA512 
d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
-DIST rcs-5.9.3.tar.xz 800736 BLAKE2B 
aa3f17555e5b65a9d65dfa781f2e12496e282128d9412529f67a831b5d6035302a6f70c4fe0b9d9519a2bf02fc5a98d03f4aa3b86696fd27874bfa7549e8c8a3
 SHA512 
99b124a94f285d8c675a2a51397ca4a97468f053d42aecf543e9266f16aea6b2667613f565c3462ffd2350c28e22baa4d01d598e2cc7e1e940625086f6de0ba6
-DIST rcs-5.9.4.tar.xz 801360 BLAKE2B 
18cb97aae7a70f9f12b1018d6b6b42fbc06dd96b491caa7ee5ae2a4a746339e22ffc93ead5756add62f8a08d5cd1ec589c242f0a75e9d78aff29b95114869b25
 SHA512 
c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4

diff --git a/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch 
b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch
deleted file mode 100644
index 568731e1903f..
--- a/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=f2330a6268d244e97f47a97f4767736fc3b31455
-https://bugs.gentoo.org/820230
-
-From: Thien-Thi Nguyen 
-Date: Thu, 5 Apr 2018 16:20:35 +0200
-Subject: [v] Avoid "test FILE1 -nt FILE2".
-
-* tests/t810: Use "btdt mtimecmp" instead of "test -nt".
-Thanks to both sergio and Xose Vazquez Perez
-for indirectly signalling this problem.  See 2018-04-05,
-"Add support for "btdt mtimecmp FILE1 FILE2"" for details.
 a/tests/t810
-+++ b/tests/t810
-@@ -27,7 +27,8 @@ split_std_out_err no
- 
- must 'echo new line >> $w'
- must 'ci -mm -l -d -T $w'
--test $w -nt $v && problem "$w newer than $v"
-+test 1 = `./btdt mtimecmp $w $v` \
-+&& problem "$w newer than $v"
- 
- exit 0
- 
-cgit v1.2.1

diff --git a/dev-vcs/rcs/rcs-5.9.3.ebuild b/dev-vcs/rcs/rcs-5.9.3.ebuild
deleted file mode 100644
index 3b42b11ff880..
--- a/dev-vcs/rcs/rcs-5.9.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic
-
-DESCRIPTION="Revision Control System"
-HOMEPAGE="https://www.gnu.org/software/rcs/";
-SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="doc"
-
-RDEPEND="
-   sys-apps/diffutils
-   sys-apps/ed"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   sed -i -e '/gets is a security hole/d' \
-   lib/stdio.in.h || die
-}
-
-src_configure() {
-   append-flags -std=gnu99
-   econf
-}
-
-src_test() {
-   emake check
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-
-   dodoc ChangeLog NEWS README
-
-   if use doc; then
-   emake -C doc html
-   rm -R "${ED}/usr/share/doc/rcs"
-   mv doc/rcs.html doc/html
-   dodoc -r doc/html/
-   fi
-}

diff --git a/dev-vcs/rcs/rcs-5.9.4.ebuild b/dev-vcs/rcs/rcs-5.9.4.ebuild
deleted file mode 100644
index e00c34d58f3f..
--- a/dev-vcs/rcs/rcs-5.9.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch flag-o-matic
-
-DESCRIPTION="Revision Control System"
-HOMEPAGE="https://www.gnu.org/software/rcs/";
-SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="doc"
-
-RDEPEND="
-   sys-apps/diffutils
-   sys-apps/ed"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-test-t810.patch
-
-   sed -i -e '/gets is a security hole/d' \
-   lib/stdio.in.h || die
-}
-
-src_configure() {
-   append-flags -std=gnu99
-   econf
-}
-
-src_test() {
-   emake check
-}
-

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rcs/, dev-vcs/rcs/files/

2021-10-29 Thread Sam James 
commit: 4281a2e29017daeddd1692866a9dcee01b11a67a
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 12:12:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 12:16:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4281a2e2

dev-vcs/rcs: backport test fixes for 5.10.0

Note that these are purely test fixes, not changes
in the logic of the program (=> no need to revbump).

Bug: https://bugs.gentoo.org/820230
Signed-off-by: Sam James  gentoo.org>

 dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch | 30 ++
 dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch | 32 
 dev-vcs/rcs/rcs-5.10.0.ebuild|  2 ++
 3 files changed, 64 insertions(+)

diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch 
b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
new file mode 100644
index 000..ea86af8fd02
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
@@ -0,0 +1,30 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=8883c4f5a29be18e9ea09bd27a7b660830de45bb
+https://bugs.gentoo.org/820230
+
+From: Thien-Thi Nguyen 
+Date: Fri, 23 Oct 2020 09:23:49 -0400
+Subject: [v] Don't test signal handling if stdin not ok.
+
+
+
+* tests/t632: If stdin is not open and connected to
+a tty, skip the signal handling portion of the test.
+--- a/tests/t632
 b/tests/t632
+@@ -40,6 +40,15 @@ echo | co -l -I $w \
+ # (This is skipped if GNU coreutils timeout(1) is not available.)
+ ##
+ 
++# 
++# The timeout test needs co(1) to block on input.
++# If stdin is not open and connected to a tty, skip out.
++if test -t 0 ; then
++echo STDIN OK
++else
++exit 0
++fi
++
+ # TODO: Don't be lame!  Pick one:
+ # (a) Mimic timeout(1) w/ sh commands.
+ # (b) Incorporate heart of timeout(1) into ./btdt and use that.
+cgit v1.2.1

diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch 
b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
new file mode 100644
index 000..86ebab5f147
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
@@ -0,0 +1,32 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=5df4567e69fc7f46d14cfbf396525c3d05bcf970
+https://bugs.gentoo.org/820230
+
+From: Thien-Thi Nguyen 
+Date: Sat, 24 Oct 2020 19:14:26 -0400
+Subject: [v] Try to handle whoami(1) returning no info.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* tests/t808 (user): If whoami(1) returns no info, no longer error out.
+Instead, jam a value, and set env vars ‘LOGNAME’ and ‘USER’, as well.
+--- a/tests/t808
 b/tests/t808
+@@ -24,8 +24,14 @@ rerr=$wd/rerr
+ 
+ user=`whoami`
+ 
+-test "$user" \
+-|| problem 'far out, man ... whoami failed!'
++if ! test "$user" ; then
++   : 'far out, man ... whoami failed!'
++   user=jrluser
++   USER=$user
++   export USER
++   LOGNAME=$user
++   export LOGNAME
++fi
+ 
+ must 'sed -e s/ttn/trulynobody/g \
+   -e s/zurg/$user/g  \
+cgit v1.2.1

diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild
index 4bd994b8b2e..02c0dfa721c 100644
--- a/dev-vcs/rcs/rcs-5.10.0.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.0.ebuild
@@ -20,6 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+   "${FILESDIR}"/${P}-test-t808.patch
+   "${FILESDIR}"/${P}-test-t632.patch
"${FILESDIR}"/${P}-glibc-2.34.patch
 )

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rcs/, dev-vcs/rcs/files/

2021-10-29 Thread Sam James 
commit: 42fbb2f03e8fd683dbfe06719229ff3959dd9bc9
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 12:16:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 12:16:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42fbb2f0

dev-vcs/rcs: backport t810 test fix for 5.9.4

Note that these are purely test fixes, not changes
in the logic of the program (=> no need to revbump).

Closes: https://bugs.gentoo.org/820230
Signed-off-by: Sam James  gentoo.org>

 dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch | 24 
 dev-vcs/rcs/rcs-5.9.4.ebuild|  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch 
b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch
new file mode 100644
index 000..568731e1903
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch
@@ -0,0 +1,24 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=f2330a6268d244e97f47a97f4767736fc3b31455
+https://bugs.gentoo.org/820230
+
+From: Thien-Thi Nguyen 
+Date: Thu, 5 Apr 2018 16:20:35 +0200
+Subject: [v] Avoid "test FILE1 -nt FILE2".
+
+* tests/t810: Use "btdt mtimecmp" instead of "test -nt".
+Thanks to both sergio and Xose Vazquez Perez
+for indirectly signalling this problem.  See 2018-04-05,
+"Add support for "btdt mtimecmp FILE1 FILE2"" for details.
+--- a/tests/t810
 b/tests/t810
+@@ -27,7 +27,8 @@ split_std_out_err no
+ 
+ must 'echo new line >> $w'
+ must 'ci -mm -l -d -T $w'
+-test $w -nt $v && problem "$w newer than $v"
++test 1 = `./btdt mtimecmp $w $v` \
++&& problem "$w newer than $v"
+ 
+ exit 0
+ 
+cgit v1.2.1

diff --git a/dev-vcs/rcs/rcs-5.9.4.ebuild b/dev-vcs/rcs/rcs-5.9.4.ebuild
index b5cd9539963..ee7d184c6b6 100644
--- a/dev-vcs/rcs/rcs-5.9.4.ebuild
+++ b/dev-vcs/rcs/rcs-5.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit flag-o-matic
+inherit epatch flag-o-matic
 
 DESCRIPTION="Revision Control System"
 HOMEPAGE="https://www.gnu.org/software/rcs/";
@@ -20,6 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+   epatch "${FILESDIR}"/${P}-test-t810.patch
+
sed -i -e '/gets is a security hole/d' \
lib/stdio.in.h || die
 }