5 files changed, 10 insertions, 179 deletions
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index a6f9d09126b6..8962cdc49866 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -1,11 +1,8 @@
 AUX cvsps-2.1-build.patch 396 BLAKE2B d75a8c98b5ecaafbc03e49b6b975d9c9c493b17ecc7205e56188d9a1b7e79b45cdf5a56bab22807ea4018eb54e27b50be13a8dd718722adc727826449c26243b SHA512 bd4e9ea02a89038e9b3d16aa075649659836d36d76145aa643008cf017fde032d66273bc4148340b1b75bfaa83830ab1381c9f9295c54915e19386538b232991
-AUX cvsps-2.1-solaris.patch 3064 BLAKE2B 0a2a9e5652953505e6a3d99412ff0472a318a442edf8624c1b961b1506b1315525d0145df80bc4cb9db92b02f9310ece10f0bab1aae3cf650dd439e32dfaa687 SHA512 b42581865d988166dd9bb6a1685feb9786c1f424f778afd795aec94f734cfd2b06955d87505c52e7d48d117c8652c7bc51730fcd4f2598acc58c810c32f6af2f
 AUX cvsps-2.2_beta1-solaris.patch 3648 BLAKE2B 0e4471b476485f0202c458cb5505636d0730689083a0be39b245856ac9f6f5e9916c4f654b1597b1a6e727e3d2e5d88f64b617e2383caba6730a7752138b5eeb SHA512 a876362b082b3a877a5ee4da7c23eab24d6f00362cd7ea33d93a71e93a185d0c30421f502d3029e493e99ef2e2ef34f0d6092f98134c3e54480e892ccaddf591
 AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a8253024f7c5b14db3d3be7d169b2e1bd487652dea56dc5bc9a963689660b7b4a059786e46dec3e6b4f48897ca SHA512 0ddc7115a0a66f418f81468230c92b17f3b7c6a38a82505de79c27764ee46ee5805ebf1d0a12360df77718cccf9bf2ac61f45b21c1cfecb7700e648ea1187e9e
-DIST cvsps-2.1.tar.gz 61634 BLAKE2B 32bf53c574ac8e7937ff14aee5a229e1bb2b4f0ddd4360d0b8d57a5d0fd5c6f683897140e235cdd6ab85e94f3977298fd38e8187db08529f8a8d814a4a8070a8 SHA512 8ba703fc4dd1c7a8201f4cefec533a6e228943f53f5380d8d17107718d8cb607c861a733d7ad1d6ed9288c4dbeae9fd59ceaf52172f16885a00d000a667e0e38
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.1-r1.ebuild 911 BLAKE2B 2636e26d0a4e7bc6ed5f9849759bac39c59bda984641855c4fee63d7e56c9a05ba64b4ad66a1fce9839c83e8111e4eba81b4278d31c270985114a82609d8122d SHA512 94306263cb7d40590e27949fa3294fd0130fc8585665c8c6e7ac9f5a1c2f051f7176f6bead4710b67ed735069666ad84e988777417dedd614bfd668f1816fd0c
-EBUILD cvsps-2.2_beta1.ebuild 913 BLAKE2B 82741333511a4127495bf1372329df827b11ee438b07392df9bc1886dc011fc6a513f16d9966ceff02e234c6669c372e1aed672f4e7f0a02441c5393884c33b4 SHA512 27c5f0f7cef37a495ebcced989115969776377d118538741638e3bcb5ac0eac0c3ae09368bbf77061a9570660d91ccb32ed45a98c0c464ea184a9f35c2d8ef0c
-EBUILD cvsps-3.13-r1.ebuild 1005 BLAKE2B 0b5ac6e71d5e79d1c7293e97b5285c46cae8851e9f6a9fddc110b3883f7ca5994f68120760e879cf27b2d791d64165670f4391812c313401118303d2cd00eac7 SHA512 9e7462d990facadac1c2f785412ff450d62dedee4cd162f4ba7a4c6d775a17838d6216847648d6932bbf459246246626343c8d76aa085ce819bfb43755dbe021
+EBUILD cvsps-2.2_beta1.ebuild 910 BLAKE2B dca2828b68f41be52836ab274808e60824fd33c52e3b3c4afab522206d02948855109bee646345500b370f7a786ebc1897a41c5e1c2ee06fac31c7e7d87ea203 SHA512 6905b434c4ada51daa52fb0208edd129a17e2170cfb5761548bdd815eeee9476e5eca5a5c10fac86f105ac5c36bb0c218496bd8da3ec0d89f5d557d5cb57633b
+EBUILD cvsps-3.13-r2.ebuild 1016 BLAKE2B 4b8ad09f420f2cdd8c5deaca57114dfa7ecfb0870d8569f3e071638544a48496d7167e6564c7271de4bdbb0b0f835b4dbb223b2991178f2e06db4d2ff60c496c SHA512 f1163dc80ae8e46c7da93b1f507a4fa22ca2ec6f448a4b8f8fdb0cf89255b1cedd352e08b30ce5a4502fe6013449e8e01d2eca998350b23568c96d2a325e7ffe
 MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf
diff --git a/dev-vcs/cvsps/cvsps-2.1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.1-r1.ebuild
deleted file mode 100644
index 7c99c5f0ec5e..000000000000
--- a/dev-vcs/cvsps/cvsps-2.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/_/}"
-DESCRIPTION="Generates patchset information from a CVS repository"
-HOMEPAGE="http://www.cobite.com/cvsps/"
-SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-solaris.patch
-	# no configure around
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e '/^LDLIBS+=/s/$/ -lsocket/' Makefile || die
-	fi
-	tc-export CC
-}
-
-src_install() {
-	dobin cvsps || die
-	doman cvsps.1
-	dodoc README CHANGELOG
-}
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
index 4ba081d4be23..f3faa6accfc2 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index 45e63d4b5dc4..1d9ca2cea5f5 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit eutils toolchain-funcs
 
@@ -20,10 +20,13 @@ DEPEND="${RDEPEND}
 
 RESTRICT=test # upstream does not ship tests
 
+PATCHES=("${FILESDIR}"/${P}-make.patch)
+
 src_prepare() {
+	default
+
 	local gentoo_name=${PN}-3
 
-	epatch "${FILESDIR}"/${P}-make.patch
 	mv ${PN}.asc ${gentoo_name}.asc || die
 	sed -i "s/${PN}/${gentoo_name}/g" ${gentoo_name}.asc || die
 	sed -i "s/PROG         = cvsps/PROG         = ${gentoo_name}/" Makefile || die
@@ -34,5 +37,6 @@ src_prepare() {
 
 src_install() {
 	default
+
 	dodoc README
 }
diff --git a/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch b/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch
deleted file mode 100644
index 3e063fd9248b..000000000000
--- a/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Modified version of 
-http://cvs.openpkg.org/fileview?f=openpkg-src/cvsps/cvsps.patch&v=1.13
-
-Index: cache.c
---- cache.c.orig	2008-04-02 03:18:44 +0200
-+++ cache.c	2008-04-02 09:10:25 +0200
-@@ -361,7 +361,7 @@
- 
-     strcpy(buff, p_buff);
- 
--    while ((s = strsep(&p, ";")))
-+    while ((s = my_strsep(&p, ";")))
-     {
- 	char * c = strchr(s, ':');
- 
-Index: cvs_direct.c
---- cvs_direct.c.orig	2008-04-02 03:18:44 +0200
-+++ cvs_direct.c	2008-04-02 09:10:25 +0200
-@@ -92,12 +92,12 @@
- 
-     strcpy_a(root, p_root, PATH_MAX);
- 
--    tok = strsep(&p, ":");
-+    tok = my_strsep(&p, ":");
- 
-     /* if root string looks like :pserver:... then the first token will be empty */
-     if (strlen(tok) == 0)
-     {
--	char * method = strsep(&p, ":");
-+	char * method = my_strsep(&p, ":");
- 	if (strcmp(method, "pserver") == 0)
- 	{
- 	    ctx = open_ctx_pserver(ctx, p);
-@@ -185,14 +185,14 @@
- 
-     strcpy_a(root, p_root, PATH_MAX);
- 
--    tok = strsep(&p, ":");
-+    tok = my_strsep(&p, ":");
-     if (strlen(tok) == 0 || !p)
-     {
- 	debug(DEBUG_APPERROR, "parse error on third token");
- 	goto out_free_err;
-     }
- 
--    tok2 = strsep(&tok, "@");
-+    tok2 = my_strsep(&tok, "@");
-     if (!strlen(tok2) || (!tok || !strlen(tok)))
-     {
- 	debug(DEBUG_APPERROR, "parse error on user@server in pserver");
-@@ -272,7 +272,7 @@
-     strcpy_a(root, p_root, PATH_MAX);
- 
-     /* if there's a ':', it's remote */
--    tok = strsep(&p, ":");
-+    tok = my_strsep(&p, ":");
- 
-     if (p)
-     {
-@@ -281,7 +281,7 @@
- 	if (!cvs_rsh)
- 	    cvs_rsh = "rsh";
- 
--	tok2 = strsep(&tok, "@");
-+	tok2 = my_strsep(&tok, "@");
- 
- 	if (tok)
- 	    snprintf(execcmd, PATH_MAX, "%s -l %s %s %s server", cvs_rsh, tok2, tok, cvs_server);
-@@ -776,7 +776,7 @@
- static int parse_patch_arg(char * arg, char ** str)
- {
-     char *tok, *tok2 = "";
--    tok = strsep(str, " ");
-+    tok = my_strsep(str, " ");
-     if (!tok)
- 	return 0;
- 
-@@ -796,7 +796,7 @@
-     /* see if command wants two args and they're separated by ' ' */
-     if (tok[2] == 0 && strchr("BdDFgiorVxYz", tok[1]))
-     {
--	tok2 = strsep(str, " ");
-+	tok2 = my_strsep(str, " ");
- 	if (!tok2)
- 	{
- 	    debug(DEBUG_APPERROR, "diff_opts parse_error: argument %s requires two arguments", tok);
-Index: util.c
---- util.c.orig	2008-04-02 03:18:44 +0200
-+++ util.c	2008-04-02 09:10:25 +0200
-@@ -316,3 +316,31 @@
- 	exit(1);
-     }
- }
-+
-+char *my_strsep(char **stringp, const char *delim)
-+{
-+	char *s;
-+	const char *spanp;
-+	int c, sc;
-+	char *tok;
-+
-+	if ((s = *stringp) == NULL)
-+		return NULL;
-+	for (tok = s;;) {
-+		c = *s++;
-+		spanp = delim;
-+		do {
-+			if ((sc = *spanp++) == c) {
-+				if (c == 0)
-+					s = NULL;
-+				else
-+					s[-1] = 0;
-+				*stringp = s;
-+				return tok;
-+			}
-+		} while (sc != 0);
-+	}
-+	/* NOTREACHED */
-+    return NULL;
-+}
-+
-Index: util.h
---- util.h.orig	2008-04-02 03:18:44 +0200
-+++ util.h	2008-04-02 09:15:35 +0200
-@@ -24,5 +24,6 @@
- void timing_stop(const char *);
- int my_system(const char *);
- int escape_filename(char *, int, const char *);
-+char *my_strsep(char **, const char *);
- 
- #endif /* UTIL_H */