bump(dev-vcs/cvsps): sync with upstream

This commit is contained in:
Nick Owens 2016-03-02 14:17:33 -08:00
parent ca06a09aa6
commit 073b47c0a6
14 changed files with 734 additions and 16 deletions

View File

@ -0,0 +1,70 @@
# ChangeLog for dev-vcs/cvsps
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*cvsps-3.13-r1 (09 Aug 2015)
*cvsps-2.2_beta1 (09 Aug 2015)
*cvsps-2.1-r1 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +cvsps-2.1-r1.ebuild,
+cvsps-2.2_beta1.ebuild, +cvsps-3.13-r1.ebuild,
+files/cvsps-2.1-build.patch, +files/cvsps-2.1-solaris.patch,
+files/cvsps-2.2_beta1-solaris.patch, +files/cvsps-3.13-make.patch,
+metadata.xml:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)

View File

@ -0,0 +1,196 @@
# ChangeLog for dev-vcs/cvsps
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/ChangeLog,v 1.26 2015/01/15 19:57:26 slyfox Exp $
15 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org> cvsps-3.13-r1.ebuild:
Don't clobber MAKEOPTS on paludis (bug #536680 by cmuelle8).
06 Oct 2014; Fabian Groffen <grobian@gentoo.org> cvsps-3.13-r1.ebuild:
Fix out of Prefix, bug #521708
03 Sep 2014; Christoph Junghans <ottxor@gentoo.org> cvsps-2.2_beta1.ebuild:
added ~x64-macos (tested by me)
*cvsps-3.13-r1 (24 Aug 2014)
24 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> +cvsps-3.13-r1.ebuild,
+files/cvsps-3.13-make.patch, -cvsps-2.1.ebuild, -cvsps-3.10.ebuild,
-cvsps-3.13.ebuild:
Slot cvsps-3 to SLOT=3 to let git-cvsimport work with cvsps-2 (bug #450424).
13 Mar 2014; Christoph Junghans <ottxor@gentoo.org> cvsps-3.13.ebuild:
added ~x64-macos (tested by me)
20 Jan 2014; Mike Frysinger <vapier@gentoo.org> cvsps-2.1-r1.ebuild,
cvsps-2.1.ebuild, cvsps-2.2_beta1.ebuild, cvsps-3.10.ebuild,
cvsps-3.13.ebuild:
Add arm64 love.
*cvsps-3.13 (28 Dec 2013)
28 Dec 2013; Sergei Trofimovich <slyfox@gentoo.org> +cvsps-3.13.ebuild:
Version bump (and deprecated by upstream in favour of cvs-fast-export
http://esr.ibiblio.org/?p=5167).
26 Jul 2013; Sergei Trofimovich <slyfox@gentoo.org> -cvsps-3.7.ebuild:
Removed old.
*cvsps-3.10 (23 Jan 2013)
23 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org> +cvsps-3.10.ebuild:
Version bump. Now with incremental import!
*cvsps-3.7 (09 Jan 2013)
09 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org> +cvsps-3.7.ebuild,
-cvsps-3.5.ebuild:
Version bump.
*cvsps-3.5 (05 Jan 2013)
05 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org> +cvsps-3.5.ebuild,
-cvsps-3.3-r1.ebuild, metadata.xml:
Version bump.
03 Jan 2013; Christoph Junghans <ottxor@gentoo.org> metadata.xml:
added upstream tag
*cvsps-3.3-r1 (01 Jan 2013)
01 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org> +cvsps-3.3-r1.ebuild,
-cvsps-3.3.ebuild:
Change prefix from '/' to '/usr' (fixes binary and man locations).
*cvsps-3.3 (31 Dec 2012)
31 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> +cvsps-3.3.ebuild:
Version bump and switch to ESRs homepage. Requested by Christoph Junghans in
bug #449504.
*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
04 Aug 2012; Anthony G. Basile <blueness@gentoo.org> cvsps-2.1-r1.ebuild:
Stable arm, bug #418975
04 Aug 2012; Anthony G. Basile <blueness@gentoo.org> cvsps-2.1-r1.ebuild:
Stable ppc ppc64, bug #418975
03 Aug 2012; Jeff Horelick <jdhore@gentoo.org> cvsps-2.1-r1.ebuild:
marked x86 per bug 418975
02 Aug 2012; Markos Chandras <hwoarang@gentoo.org> cvsps-2.1-r1.ebuild:
Stable on amd64 wrt bug #418975
01 Aug 2012; Jeroen Roovers <jer@gentoo.org> cvsps-2.1-r1.ebuild:
Stable for HPPA (bug #418975).
09 May 2012; Alexis Ballier <aballier@gentoo.org> cvsps-2.1-r1.ebuild:
keyword ~amd64-fbsd
20 Apr 2011; Justin Lecher <jlec@gentoo.org> cvsps-2.1.ebuild,
cvsps-2.1-r1.ebuild:
Respect CC, #243992
19 Oct 2010; Mart Raudsepp <leio@gentoo.org> cvsps-2.1.ebuild:
Drop to ~mips
03 Sep 2010; Christian Faulhammer <fauli@gentoo.org> cvsps-2.1-r1.ebuild:
add ~x86-freebsd
19 Jun 2010; Jonathan Callen <abcd@gentoo.org> +cvsps-2.1.ebuild,
+cvsps-2.1-r1.ebuild, +files/cvsps-2.1-build.patch,
+files/cvsps-2.1-solaris.patch, +metadata.xml:
Move package from dev-util/cvsps to dev-vcs/cvsps
*cvsps-2.1-r1 (06 Mar 2010)
06 Mar 2010; Fabian Groffen <grobian@gentoo.org> +cvsps-2.1-r1.ebuild,
+files/cvsps-2.1-solaris.patch:
Revbump for Prefix patches, transferred Prefix keywords, bug #307939
10 Jun 2008; Raúl Porcel <armin76@gentoo.org> cvsps-2.1.ebuild:
ia64 stable
07 Jun 2008; Alexis Ballier <aballier@gentoo.org> cvsps-2.1.ebuild:
keyword ~sparc-fbsd
07 Jun 2008; Alexis Ballier <aballier@gentoo.org> cvsps-2.1.ebuild:
keyword ~x86-fbsd
24 Mar 2008; Raúl Porcel <armin76@gentoo.org> cvsps-2.1.ebuild:
Add ~ia64 wrt #214464
24 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+files/cvsps-2.1-build.patch, cvsps-2.1.ebuild:
Respect user LDFLAGS.
01 May 2007; Fabian Groffen <grobian@gentoo.org> cvsps-2.1.ebuild:
Dropped ppc-macos keyword, see you in prefix, resolves bug #173882
22 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> cvsps-2.1.ebuild:
ppc stable, bug #173882
10 Apr 2007; Jeroen Roovers <jer@gentoo.org> cvsps-2.1.ebuild:
Stable for HPPA (bug #173882).
10 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> cvsps-2.1.ebuild:
Stable on sparc wrt #173882
19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
Remove ka0ttic from metadata.xml due to retirement.
21 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org> cvsps-2.1.ebuild:
Stable on MIPS.
17 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> cvsps-2.1.ebuild:
Add missing dependency over zlib.
28 Jun 2006; Fabian Groffen <grobian@gentoo.org> cvsps-2.1.ebuild:
Marked ~ppc-macos
07 Feb 2006; Simon Stelling <blubb@gentoo.org> cvsps-2.1.ebuild:
stable on amd64
25 Nov 2005; Tom Gall <tgall@gentoo.org> cvsps-2.1.ebuild:
stable on ppc64
18 Sep 2005; Markus Rothe <corsair@gentoo.org> cvsps-2.1.ebuild:
Added ~ppc64 (bug #106318)
10 Sep 2005; Aron Griffis <agriffis@gentoo.org> cvsps-2.1.ebuild:
Mark 2.1 stable on alpha
06 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> cvsps-2.1.ebuild:
Stable on x86.
*cvsps-2.1 (26 May 2005)
26 May 2005; Aaron Walker <ka0ttic@gentoo.org> cvsps-2.0_rc1.ebuild,
+cvsps-2.1.ebuild:
Version bump.
22 May 2005; Simon Stelling <blubb@gentoo.org> cvsps-2.0_rc1.ebuild:
stable on amd64
31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
Change encoding to UTF-8 for GLEP 31 compliance
03 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> cvsps-2.0_rc1.ebuild:
Stable on alpha.
20 May 2004; Danny van Dyk <kugelfang@gentoo.org> cvsps-2.0_rc1.ebuild:
Marked ~amd64.
*cvsps-2.0_rc1 (30 Jun 2003)
30 Jun 2003; Seemant Kulleen <seemant@gentoo.org> cvsps-2.0_rc1.ebuild:
New package -- provides a way to generate BK style changesets for CVS. Thanks
to Rach Holmes for showing me this

View File

@ -1 +1,13 @@
DIST cvsps-2.1.tar.gz 61634 RMD160 a3063f638fbf1136761549658432d5842e4a766f SHA1 a53a62b121e7b86e07a393bcb8aa4f0492a747c4 SHA256 91d3198b33463861a581686d5fcf99a5c484e7c4d819384c04fda9cafec1075a
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
AUX cvsps-3.13-make.patch 1189 SHA256 5aa8e745d6d4a41eb3640bbf5df7c4a95879ab64787a3f1ad32afd04af7ed159 SHA512 0ddc7115a0a66f418f81468230c92b17f3b7c6a38a82505de79c27764ee46ee5805ebf1d0a12360df77718cccf9bf2ac61f45b21c1cfecb7700e648ea1187e9e WHIRLPOOL f9b4ee45f105410ce1e0f317f3d3120a94183e0b33fc6a102ca13dc5ecfedf34ab5deb6583494865f9e419457d1b5eacd1a2c982c020182e10f3470a7972804b
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
DIST cvsps-3.13.tar.gz 64437 SHA256 5f078a6e02c394f663893751f128caf643fe00a30b559e87db6f45190c623799 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f WHIRLPOOL 52694e8b2b3cb0924333d80533618f687676f0b44f782c1c4f7bbc28a4f4e6a425c966823f027db7dcee27695c27c0b136115e449e83eac43459a7da03baa57c
EBUILD cvsps-2.1-r1.ebuild 970 SHA256 72a7f38095ef8070f57c7d0ecc1c3b500f9f33a04e39d89dea52964c3bda25b3 SHA512 148801e9b6e81b7345b1048326d4d06215124b8e4d146a2fb7cd2827e3e9ded3448226a22a3d60dbc28e5b67028b18e58ea0dc891e51c8ee53a5c19c61b9fcc6 WHIRLPOOL b8ac3e3d9bdd30a4644f40fef55245a990ea4b10caf13f8362affdab943447712b0150a89c3c9edbbdd3d9de37099b9b1a72fc479e39674a228a0df134fac4a2
EBUILD cvsps-2.2_beta1.ebuild 991 SHA256 211bcccaf2e5739cd4baf2b73c5d899210db631cb30aced5f36061d8e8a4aca4 SHA512 e033c501b7db333f941d5a1c58acb5b596ea3b1dd874af29a7f1af3d415ec56205a4c2dd6d9dabc9833f709890c8309a0adc799b4d64e2975fe0c1a66e5cb201 WHIRLPOOL 5fe9dabba35ef9c304ebf9a049a5034826bbb05000488ba445d503257cad3b7a58209ee5d78c59f656b4c2fe756249d7cab07cb79e5e1274968d7f33c6c9078a
EBUILD cvsps-3.13-r1.ebuild 1072 SHA256 a2d4ae7189f8aa244a07058e1ea7c89993f46cc3aed9740099199bfd23c65149 SHA512 6cfa21d8b4e48ead4a4974a4df47bc9a94ba04951a98c995724b60dedae0ecda69f0e9b7814300cd8c0b04b06a76982b69eec10b57ab06ac27f3ae79b2ce8351 WHIRLPOOL 7e65cf399f3785c97058ea651f78bfb9c9d1df0677c967569c65e93b46f5bbfd1ed7884c943a5243a116e55548ec0d9f5fcb198a76363c9bb55c1bc4362e54c5
MISC ChangeLog 2666 SHA256 bf45352b9614ba2e28428ff0a840eeee70fa2b6fe235750f8f62b21ba7766e80 SHA512 31146f47ff89dec146d91cd0b1acd5a80007ffc7cc624e7bb68e857c7a2f34cb9c872a821240d0a61f9aa509775a4e61c856110ccf44a6fbd95f7cea2ce76c40 WHIRLPOOL 1d06264f3c48eb140fa4c44ff8d657efe46b198ba88a1eab41d8635c669f26fa9f6b833cba612d036c5e558b9518664e160ef353404d506bfcdf75fb14420450
MISC ChangeLog-2015 6582 SHA256 199f4edc5cf349ad8868f4ebaa930e3578344fc530c16742476afd20ee049a37 SHA512 26c5c8a2c273872e0058e5e620548cf1b2273f0c728a1bb7996f9dec397577c09fe349306659cbd9699b049ddf290faad6cedf3a7a967c1cae22340bfbb6ebc4 WHIRLPOOL 423302d9ae13cb5eeafb400832514cbb7a7d6a8e90ab872e1e605d42796116d69a5cae55154631e723629657cc2a11d3bab030d3232f03d2fa60986b90814ada
MISC metadata.xml 439 SHA256 0ed9a0aeb4405965433909e19ad2627a31154f08cdff33214162ab022a681fc6 SHA512 45494ce3c0efc67090bb2c8a3538f5cf8e0b71487059c678421bc38d5395d09a77cfaedd98804bfedc53945ed6048f382f088066db6f570201cf54470fb1a153 WHIRLPOOL 094f00b3690c97d6d724dc05b1f6f12822b2af35208e33d8dbe2bda2d08bdb4fc05295c8f007440c20ad341b833e7d703c75ae60efe37dd14abe85bfe6418f92

View File

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/cvsps-2.1.ebuild,v 1.4 2011/04/20 12:46:35 jlec Exp $
# $Id$
inherit eutils toolchain-funcs
@ -11,7 +11,7 @@ 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 ~sparc-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm arm64 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=""
DEPEND="sys-libs/zlib"
@ -23,6 +23,11 @@ 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
}

View File

@ -0,0 +1,38 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
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 ~arm64 ~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 ~x64-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
}

View File

@ -0,0 +1,39 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="Generates patchset information from a CVS repository (supports fast-import)"
HOMEPAGE="http://www.catb.org/~esr/cvsps/"
SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}
app-text/asciidoc"
RESTRICT=test # upstream does not ship tests
src_prepare() {
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
tc-export CC
export prefix="${EPREFIX}"/usr
}
src_install() {
default
dodoc README
}

View File

@ -0,0 +1,131 @@
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 */

View File

@ -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 */

View File

@ -0,0 +1,52 @@
diff --git a/Makefile b/Makefile
index 6266c9d..4f60d2f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,9 @@ INSTALL = install
prefix?=/usr/local
target=$(DESTDIR)$(prefix)
+PROG = cvsps
+MANPAGE = $(PROG).1
+
OBJS= debug.o \
hash.o \
sio.o \
@@ -19,12 +22,12 @@ OBJS= debug.o \
cvsclient.o \
list_sort.o
-all: cvsps
+all: $(PROG) $(MANPAGE)
deps:
makedepend -Y -I. *.c
-cvsps: $(OBJS)
- $(CC) -o cvsps $(OBJS) $(LDFLAGS) $(LDLIBS)
+$(PROG): $(OBJS)
+ $(CC) -o $(PROG) $(OBJS) $(LDFLAGS) $(LDLIBS)
check:
@@ -50,17 +53,17 @@ pylint:
.txt.html:
a2x --doctype manpage --format xhtml $*.txt
-install: cvsps.1 all
+install: all
$(INSTALL) -d "$(target)/bin"
$(INSTALL) -d "$(target)/share/man/man1"
- $(INSTALL) cvsps "$(target)/bin"
- $(INSTALL) -m 644 cvsps.1 "$(target)/share/man/man1"
+ $(INSTALL) $(PROG) "$(target)/bin"
+ $(INSTALL) -m 644 $(MANPAGE) "$(target)/share/man/man1"
tags: *.c *.h
ctags *.c *.h
clean:
- rm -f cvsps *.o core tags cvsps.1 cvsps.html docbook-xsl.css
+ rm -f $(PROG) *.o core tags $(MANPAGE) cvsps.html docbook-xsl.css
SOURCES = Makefile *.[ch] merge_utils.sh
DOCS = README COPYING NEWS cvsps.asc TODO

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>slyfox@gentoo.org</email>
<name>Sergei Trofimovich</name>
</maintainer>
<maintainer type="project">
<email>cvs-utils@gentoo.org</email>
<name>Gentoo CVS Project</name>
</maintainer>
<upstream>
<remote-id type="freecode">cvsps</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,12 +0,0 @@
DEFINED_PHASES=install unpack
DEPEND=sys-libs/zlib
DESCRIPTION=Generates patchset information from a CVS repository
EAPI=0
HOMEPAGE=http://www.cobite.com/cvsps/
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-2
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=http://www.cobite.com/cvsps/cvsps-2.1.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
_md5_=94d56111062bc3f4e4fd3d206089755f

View File

@ -0,0 +1,12 @@
DEFINED_PHASES=install unpack
DEPEND=sys-libs/zlib
DESCRIPTION=Generates patchset information from a CVS repository
EAPI=0
HOMEPAGE=http://www.cobite.com/cvsps/
KEYWORDS=alpha amd64 arm arm64 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
LICENSE=GPL-2
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=http://www.cobite.com/cvsps/cvsps-2.1.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=d35fb60c4da4fb2103fd9c518a3e204d

View File

@ -0,0 +1,12 @@
DEFINED_PHASES=install prepare
DEPEND=sys-libs/zlib
DESCRIPTION=Generates patchset information from a CVS repository
EAPI=4
HOMEPAGE=http://www.cobite.com/cvsps/
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~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 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=47843b94dcbefee2d4a89befa1750a35

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=install prepare
DEPEND=sys-libs/zlib app-text/asciidoc
DESCRIPTION=Generates patchset information from a CVS repository (supports fast-import)
EAPI=5
HOMEPAGE=http://www.catb.org/~esr/cvsps/
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~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 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-libs/zlib
RESTRICT=test
SLOT=3
SRC_URI=http://www.catb.org/~esr/cvsps/cvsps-3.13.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=55bbf615be2010dcee621e2ccf85a1dc