Version bump by Jonas Bernoulli (stable versions are known to crash on real-world repositories).

Package-Manager: portage-2.2.0_alpha133_p5/cvs/Linux x86_64

5 files changed, 195 insertions, 8 deletions

diff --git a/dev-vcs/cvsps/ChangeLog b/dev-vcs/cvsps/ChangeLog
index 9fd64e06fa8d..4e097d155c10 100644
--- a/dev-vcs/cvsps/ChangeLog
+++ b/dev-vcs/cvsps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/cvsps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/ChangeLog,v 1.11 2012/08/26 18:26:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/ChangeLog,v 1.12 2012/10/02 15:58:59 slyfox Exp $
+
+*cvsps-2.2_beta1 (02 Oct 2012)
+
+  02 Oct 2012; Sergei Trofimovich <slyfox@gentoo.org> +cvsps-2.2_beta1.ebuild,
+  +files/cvsps-2.2_beta1-solaris.patch, metadata.xml:
+  Version bump by Jonas Bernoulli (stable versions are known to crash on real-
+  world repositories).
 
   26 Aug 2012; Raúl Porcel <armin76@gentoo.org> cvsps-2.1-r1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #419894
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index da89caefaa3e..a9c06d3dc434 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cvsps-2.1-build.patch 396 SHA256 77f31e3e4cbd223a69f0a8be0bec568520eb821bd0ffea5fae64d918adda298d SHA512 bd4e9ea02a89038e9b3d16aa075649659836d36d76145aa643008cf017fde032d66273bc4148340b1b75bfaa83830ab1381c9f9295c54915e19386538b232991 WHIRLPOOL 8eb87f79c78acfea4297af91309b4d2d4e953317b0e9ee5a6f139756a8feb8fa403d665d521bf9f767920f127b0f4f344581d4dc6784de1133964cc1c33d207b
 AUX cvsps-2.1-solaris.patch 3064 SHA256 1df81614d4be5f269aea11fc2238c8835f7b8736f42fccd263e12c92aeb129f2 SHA512 b42581865d988166dd9bb6a1685feb9786c1f424f778afd795aec94f734cfd2b06955d87505c52e7d48d117c8652c7bc51730fcd4f2598acc58c810c32f6af2f WHIRLPOOL f19da0cb0a414c9e025a394f5731057b9aeaa83a9cde84de1422103276c2c0ff2175314b7fd97dd16b19d307629243990e38778857708536159ff2747d253b42
+AUX cvsps-2.2_beta1-solaris.patch 3648 SHA256 607a22c49a2a7261048c8d53f2602c65ca7529f150afe7215c07cdb6ff7db64c SHA512 a876362b082b3a877a5ee4da7c23eab24d6f00362cd7ea33d93a71e93a185d0c30421f502d3029e493e99ef2e2ef34f0d6092f98134c3e54480e892ccaddf591 WHIRLPOOL a14381df95abe6d259241fddcac33a762727efb0fd828d0c2020e6a537a3b6b31778b7be658f2be646e4cb73df92ec6307b504a605a7ac69a86f11c273c5528e
 DIST cvsps-2.1.tar.gz 61634 SHA256 91d3198b33463861a581686d5fcf99a5c484e7c4d819384c04fda9cafec1075a SHA512 8ba703fc4dd1c7a8201f4cefec533a6e228943f53f5380d8d17107718d8cb607c861a733d7ad1d6ed9288c4dbeae9fd59ceaf52172f16885a00d000a667e0e38 WHIRLPOOL 8299c0ff5ae5701409142c02fad6c604b2aadd2038282b29b49ff8934eb0740f456b3e4d837ed966e31af7ebb73f2e8e97bd48190ed806dbb3ed76182ba85caf
+DIST cvsps-2.2b1.tar.gz 62763 SHA256 6906acb3636cdb4a4a9d608111aec22a85530037cb08a62ed5eb74ca0b218f81 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d WHIRLPOOL e60706d0324a28a6bcbdc6aeb73e51211295e2b6462d04d7b1bc54634ae8b558971ac0545860a7649dd230a8de823e9ec1912b97bfe584d59bc76808b49d6ec8
 EBUILD cvsps-2.1-r1.ebuild 1067 SHA256 e7dbeb4adad97460c319a8edcdce91d3426b0ea79c5ddd393c608c6213dcb1ed SHA512 97a1163cc24f4bcf02c766531280b0cd699dcd71f709bbb6fcddbfe4234535b0c5523ce3d89229611a5baef24873be7e2a4d5bc64ec594b36164579dfe5961d0 WHIRLPOOL e58a89a6e7f53535891599ea652e607aec77d0cbb4d0c1ba5e8887a172449de3b3a4459d896a79cc2047a772362720ebf18fbd73c0182fb7959913f30b82ef51
 EBUILD cvsps-2.1.ebuild 786 SHA256 03d497478f84efdb5aff0f08931169a3e73d329da32b1b084d9ddec6928e6ae6 SHA512 9e0151d647c09e9574be8bd9a269c0f527a2be8eb622c327e2be5ee3c4d02cf2722d4e26ee7f96ceccb514788010c4366f16fa400e3827eefb6840963dfba6aa WHIRLPOOL 9bcbffc2ea318c6abeb46b4b3679226203ea5fe9525df7b5818347055c0fa2fcf55f27bc526d8332ac6c0a7384a6ea23415c3a5708fd34804d05f7c937f839bb
-MISC ChangeLog 4177 SHA256 a136117c7d7cfb6013a8306d7926157af7ac9ecf4bb92493d9e97bb11d5457eb SHA512 e521287082bb048cf890a4f727dd821cedb88480a6a193a4135a292d4ce94a8faa80035feb10f6c76a0d97a5ff1087e02df6db0a3a0e0e7c9698d7afc2797977 WHIRLPOOL 6ae3a76ba1499e7837791cce6f28b116a3b34850a1918f13cb6a9257868ddf1d5798a08db08b200dc49c3b606dbb1d87e250bcc5cb5733db617cf1566f59946f
-MISC metadata.xml 163 SHA256 f9b2c117db0e347d23449cfe541b43a645d682d03043e9c822571bbecff71eb9 SHA512 628841f02a8e2af52e0b15f48d02ef072284bfe0a7d1ca84992617f5687e5b58d2ae117e623c97ea9a10955180650d72305be4c741a88051bfaadc242f2de403 WHIRLPOOL f1eb99eebb5098a8d7a93f56e8ee8494730d2cb32fc9f5d48a7a2c54fd336135b5c12e97f53f9806bd2a58628f23592781b577e48039944e7e8f0e55f4133698
+EBUILD cvsps-2.2_beta1.ebuild 1077 SHA256 4f2e3c0dab9633d4f957b02914743cc2ba3e65bb71e38e11d66589c222cfaf51 SHA512 9ef87d38b32448aab37582a5a83caa6550a97113ee82f449415a9788995788a15e57f872c2fba8511eff6bdcbcb736dc0142a27879cad311e881c4d7a599f2b7 WHIRLPOOL d72a049b73533b970b67a65b97bef2538f08f4694dfceca6af9ff9a317fb3f82cbc953248c0e38020f6fa148a39c4b6c86452b529576b142c10d79db397cb1c8
+MISC ChangeLog 4444 SHA256 da98f7cb624843107a3ee4360f921073aff290bcf6c39c5b699f1f7e944d75ff SHA512 88b7ac497db4cad06d9bc88c591a22c114ccaf476ec7e2dd21f7f09b44c9e63ab33c30397668053f479c538b3b8dc033f82b678b7e2072cfc8040a2869ec13b5 WHIRLPOOL 01380b87a0fe1e2def42fa985543bb4f608c54c5c96aaaeab39d01b599730df235d36d8cc9f107f554c7d46174e21664279179969bccfea4f9fbdda0d42a196d
+MISC metadata.xml 261 SHA256 6952b51276e920046c899c7aa1d7cd03233c90f01ff845312fae4b606d1e0d38 SHA512 856873ada812289613e9c4a81817e585327436172faba3bca62ad85328c07e337c039eb7c695163d84c12632527eade4aaa3cc119b5ce8460d3e569383cf53da WHIRLPOOL 3553028b177b1e41a6d0259fb2cd7dfc1da9d27f090416c3688682d7e33fe042559b6e343d3f1b47eb94e10d3582e2b8f8f12cb6b6fb9cbacf47e39815f5a76e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlA6amcACgkQuQc30/atMkCn5wCgh/v4pSlQNL/tLkpkLBLY+cV+
-gMkAn3QAbOh5DzmAwHrO2yxv2Q/4nZQu
-=QicH
+iEYEAREIAAYFAlBrD1QACgkQcaHudmEf86pGiwCfad0JMREcUx0HxhE7dsmJGSb7
+YgEAn2P22Te3VZRm3bipvl8rN56Bsmoj
+=Byzi
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
new file mode 100644
index 000000000000..eaab35c7f22e
--- /dev/null
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild,v 1.1 2012/10/02 15:58:59 slyfox Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_P="${P/_beta/b}"
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1-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/files/cvsps-2.2_beta1-solaris.patch b/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch
new file mode 100644
index 000000000000..444ac1382a7b
--- /dev/null
+++ b/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch
@@ -0,0 +1,135 @@
+Modified version of.
+http://cvs.openpkg.org/fileview?f=openpkg-src/cvsps/cvsps.patch&v=1.13
+
+diff --git a/cache.c b/cache.c
+index 4c51cf7..2c3918d 100644
+--- a/cache.c
++++ b/cache.c
+@@ -361,7 +361,7 @@ static void parse_cache_revision(PatchSetMember * psm, const char * p_buff)
+ 
+     strcpy(buff, p_buff);
+ 
+-    while ((s = strsep(&p, ";")))
++    while ((s = my_strsep(&p, ";")))
+     {
+ 	char * c = strchr(s, ':');
+ 
+diff --git a/cvs_direct.c b/cvs_direct.c
+index e281848..5aa8f0f 100644
+--- a/cvs_direct.c
++++ b/cvs_direct.c
+@@ -92,12 +92,12 @@ CvsServerCtx * open_cvs_server(char * p_root, int compress)
+ 
+     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 @@ static CvsServerCtx * open_ctx_pserver(CvsServerCtx * ctx, const char * p_root)
+ 
+     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 @@ static CvsServerCtx * open_ctx_forked(CvsServerCtx * ctx, const char * p_root)
+     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 @@ static CvsServerCtx * open_ctx_forked(CvsServerCtx * ctx, const char * p_root)
+ 	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 @@ void cvs_rupdate(CvsServerCtx * ctx, const char * rep, const char * file, const
+ 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 @@ static int parse_patch_arg(char * arg, char ** str)
+     /* 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);
+diff --git a/util.c b/util.c
+index 7884c84..f3ab3a3 100644
+--- a/util.c
++++ b/util.c
+@@ -316,3 +316,31 @@ void strcpy_a(char * dst, const char * src, int n)
+ 	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;
++}
++
+diff --git a/util.h b/util.h
+index ff2d3a0..336fd63 100644
+--- a/util.h
++++ b/util.h
+@@ -24,5 +24,6 @@ void timing_stop(const char *);
+ int my_system(const char *);
+ int escape_filename(char *, int, const char *);
+ void strcpy_a(char * dst, const char * src, int n);
++char *my_strsep(char **, const char *);
+ 
+ #endif /* UTIL_H */
diff --git a/dev-vcs/cvsps/metadata.xml b/dev-vcs/cvsps/metadata.xml
index 45023270b146..83cb5286d04e 100644
--- a/dev-vcs/cvsps/metadata.xml
+++ b/dev-vcs/cvsps/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer>
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 	<herd>cvs-utils</herd>
 </pkgmetadata>