6 files changed, 15 insertions, 182 deletions
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 5b05e72cd381..876fa582fb91 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,8 +1,3 @@
-AUX rcs-5.10.0-glibc-2.34.patch 1276 BLAKE2B b254af7dd5c8fa14211b0501be41a1e9411bf67a2d9351bf1e375eba9ea3cc118be989f0fe7ce4504329c40ba3a36eb84ba2b66897317328e90108e1190fb238 SHA512 3d398005e3d9bf2143a4590abfb82094287810e7bc6274869d64b3800ff15faabfa12a3cc5b5d087fb1831adb1394b22324d3d80d7e0dad47e3d1a2263573361
-AUX rcs-5.10.0-test-t632.patch 976 BLAKE2B 95837ba618cf67ffb46c58b9389933615874e318205e3e755a0d34137b8aafdde8f8772669d78c79df6e314ac958f20f97cb4953e756907a36f5db7d30cf99fc SHA512 08d4c1537d78217dbe9f0157cbb4649790d1863ee36623b2e05219ba91f83b55b20eb59149ccd98d67b7a6a59d0236c645045d613dce24a77b6b3dc9b56d8a3c
-AUX rcs-5.10.0-test-t808.patch 895 BLAKE2B 77f406a10101aac745b5ce8eef14514eb4b7722a0b8091f3e39b2ad5db8fc5e569aa51abcccbf90c7278a3dfd3a84b1e95c4c949c8140b1f84a9fe9c37cfe686 SHA512 15e81e6eb3520101237bbfd6d45fcf80155084f13f892d1ac38dc216e7f5aac1e2a469a9546dea8711dcbfba37b8079a6a9c93f50b0387bd936323aa456605e7
-DIST rcs-5.10.0.tar.xz 890872 BLAKE2B 32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba SHA512 d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
 DIST rcs-5.10.1.tar.lz 917331 BLAKE2B bf439b2bbb6d5d427f28b13d739f2a5902aa3113e958528028ff553007ad124a8c386141e10ff2d0157468d893e1da4a19240acb373a3f375aa21d97c187a4dd SHA512 4d3755d704a05da8582acb78a83845885f34b3144af6d19c568e6707831563b077ec5603a12f5d4de6ec583d0886d3a8ccc7ee0e1f10070f9e6de142198cd530
-EBUILD rcs-5.10.0.ebuild 1151 BLAKE2B 9e977bf0f3c1a2c9d96dd313f276e4870f0f064156f0bbcc569e875dde96cf478f24a023543208f7d5ec81fae9181845da8f17d083fba611ede2b9423a1b46d3 SHA512 ec5f4d46c0f17e5701ee22839e04f838938af79b22fe3df9500f2a0ab04a356dcf784ca9103ed7c38d067b21147bfefa00bb2c34e7d5a928285086704178120a
 EBUILD rcs-5.10.1.ebuild 1055 BLAKE2B 918aad5d9243ea4443ad2976811f93da10af7696fc7aa5e90c02f50ebc54ac9dc036a3ca934977237128641193a9845801e00588d570fba17b687e5ad60838be SHA512 aebf1408abecc4a85147e5f65b6a9842c7ee93ee90a575b54716836ef1f1baa182a24084c7824b7b7b4640123241613e9b7bcac75db2754a30c6fcbf828106a2
-MISC metadata.xml 615 BLAKE2B 4e00cd56075f6ac650d317e09a31bf40b3d64c098ff472f032bbeed9e30188e98e81fc0175cbf9d0a565cdc4bcdac6e6da6d551d48e6cb9fb82e45de0c840f42 SHA512 c51c417b5440c81d4517879495ba0f8b941d8201089bb09499045ba7b16a4de1c29938e9124d43e244639cbd2177cfaa3b8432686a7ce23421e7386471fa4032
+MISC metadata.xml 697 BLAKE2B 4770117ea60a6aa805fa1d264d758b57f60b642f682c87525be0300ecad3757ed20f9ede303a97e377f3ad0549b694ce6745393194184cb10b5bffbe5a052f8b SHA512 fd46936d0cf4c0a5307f5afcf59e799502b942ea046969c32df658d95cb623ec31a1012557e5ba6a63bb71092c8207709f96a4abaf4c823f1b677b8e7f691c90
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch b/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
deleted file mode 100644
index 5ee636bc522a..000000000000
--- a/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=10fb2a018f320ff3c1615baa5af491410d9f8d09
-https://bugs.gentoo.org/806356
-
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 5 Apr 2021 10:13:49 -0700
-Subject: =?UTF-8?q?Don=E2=80=99t=20use=20SIGSTKSZ=20in=20#if?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Christoph Karl in:
-https://lists.gnu.org/r/bug-rcs/2021-04/msg00000.html
-* b-isr.c (ISR_STACK_SIZE): Remove.
-(isr_init): Don’t assume SIGSTKSZ is a preprocessor constant.
---- a/src/b-isr.c
-+++ b/src/b-isr.c
-@@ -198,22 +198,17 @@ setup_catchsig (size_t count, int const set[VLA_ELEMS (count)])
- #undef MUST
- }
- 
--#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
--#define ISR_STACK_SIZE  (10 * SIGSTKSZ)
--#else
--#define ISR_STACK_SIZE  0
--#endif
--
- struct isr_scratch *
- isr_init (bool *be_quiet)
- {
-   struct isr_scratch *scratch = ZLLOC (1, struct isr_scratch);
- 
--#if ISR_STACK_SIZE
-+#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
-+  size_t stack_size = 10 * SIGSTKSZ;
-   stack_t ss =
-     {
--      .ss_sp = alloc (PLEXUS, ISR_STACK_SIZE),
--      .ss_size = ISR_STACK_SIZE,
-+      .ss_sp = alloc (PLEXUS, stack_size),
-+      .ss_size = stack_size,
-       .ss_flags = 0
-     };
- 
-cgit v1.2.1
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
deleted file mode 100644
index ea86af8fd022..000000000000
--- a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=8883c4f5a29be18e9ea09bd27a7b660830de45bb
-https://bugs.gentoo.org/820230
-
-From: Thien-Thi Nguyen <ttn@gnu.org>
-Date: Fri, 23 Oct 2020 09:23:49 -0400
-Subject: [v] Don't test signal handling if stdin not ok.
-
-<https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html>
-
-* 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.)
- ##
- 
-+# <https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html>
-+# 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
deleted file mode 100644
index 86ebab5f1475..000000000000
--- a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=5df4567e69fc7f46d14cfbf396525c3d05bcf970
-https://bugs.gentoo.org/820230
-
-From: Thien-Thi Nguyen <ttn@gnu.org>
-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/metadata.xml b/dev-vcs/rcs/metadata.xml
index 844c10a9ea90..e69b106e893c 100644
--- a/dev-vcs/rcs/metadata.xml
+++ b/dev-vcs/rcs/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>titanofold@gentoo.org</email>
-		<name>Aaron W. Swenson</name>
-	</maintainer>
-	<longdescription>
-		The Revision Control System (RCS) is a system for managing
-		multiple versions of files. RCS automates the storage, retrieval,
-		logging, identification and merging of file revisions. RCS is useful
-		for text files that are revised frequently (for example, programs,
-		documentation, graphics, papers and form letters).
-	</longdescription>
+  <maintainer type="person">
+    <email>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <longdescription>
+  The Revision Control System (RCS) is a system for managing
+  multiple versions of files. RCS automates the storage, retrieval,
+  logging, identification and merging of file revisions. RCS is useful
+  for text files that are revised frequently (for example, programs,
+  documentation, graphics, papers and form letters).
+  </longdescription>
+  <upstream>
+    <remote-id type="savannah">rcs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild
deleted file mode 100644
index 7a3d453f1e0d..000000000000
--- a/dev-vcs/rcs/rcs-5.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-t808.patch
-	"${FILESDIR}"/${P}-test-t632.patch
-	"${FILESDIR}"/${P}-glibc-2.34.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/gets is a security hole/d' \
-		lib/stdio.in.h || die
-}
-
-src_configure() {
-	append-flags -std=gnu99
-	econf
-}
-
-src_test() {
-	# Tests attempt to call rcs commands on /dev/null and /tmp.
-	# https://bugs.gentoo.org/840173
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /
-	default
-}
-
-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
-}