Slot cvsps-3 to SLOT=3 to let git-cvsimport work with cvsps-2 (bug #450424).

Package-Manager: portage-2.2.12_p6/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

6 files changed, 80 insertions, 81 deletions

diff --git a/dev-vcs/cvsps/ChangeLog b/dev-vcs/cvsps/ChangeLog
index b8c79e537e76..2f24ce198ca0 100644
--- a/dev-vcs/cvsps/ChangeLog
+++ b/dev-vcs/cvsps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/cvsps
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/ChangeLog,v 1.22 2014/03/13 20:09:09 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/ChangeLog,v 1.23 2014/08/24 13:49:08 slyfox Exp $
+
+*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)
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index be9e0cba108f..2eb5b03fb9f0 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -4,25 +4,19 @@ 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
+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.10.tar.gz 64303 SHA256 d9c11fc3d95b584d3096c85b88d525e8f344d4f3bf02a43423b46bbd2e01eaf2 SHA512 9f391f5c73831d805da6cf2b3693558d10d8f64ae79fa397081b3bef132295831e66998ca70d2fb88286eb0218536a88fedef14196de52e4c677c7cda1077ef8 WHIRLPOOL 7f82f912dc5e69eef1c7a34041a0af3ddb422ecac6604f640cae0538b5aeba9824f1c2b3db2268832f218c4a64c61f6e80046575c37812cba3b39d4d916e159a
 DIST cvsps-3.13.tar.gz 64437 SHA256 5f078a6e02c394f663893751f128caf643fe00a30b559e87db6f45190c623799 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f WHIRLPOOL 52694e8b2b3cb0924333d80533618f687676f0b44f782c1c4f7bbc28a4f4e6a425c966823f027db7dcee27695c27c0b136115e449e83eac43459a7da03baa57c
 EBUILD cvsps-2.1-r1.ebuild 1072 SHA256 3996ab6e8be36697630ab9c3190097f129eafa23299c1a832f9575427ceb1432 SHA512 fc5b01bff586e8e5b330eba34736256f2c4fb74066ea02fe9b15b7cb25a130f0b289b05ff77552906607afdcb3356386ec05be7761c4220c6ed8d01261a5bd6d WHIRLPOOL c8929526daa8b7d1762b2ea0f53676be0b187b0917cea6c5edf851ad40f9a129497cdccbeba7a837ee080769d3da2b7645e47106a6b23409eb69d529d2a9bcd7
-EBUILD cvsps-2.1.ebuild 794 SHA256 0ea9470e15946bd4bfbe6e97b087a776fa2533fa4a705e553c1dd66a81c7ed03 SHA512 64c5622e108a8ba90bdc47c5c0814c7b5555a00bf38b5e27fc475dc32ae73319031e3e4dec8c359a7e76b6ddef799105e44a396b89ddcc80494d0303dd3dd129 WHIRLPOOL ccf616249065647b2e718c4e58c00b4ab2e3647232d8c90540a2178eab3220b61cc303a7d391cff38fc485885a435b231d77be48f82a9f44872cbc010f315b6b
 EBUILD cvsps-2.2_beta1.ebuild 1084 SHA256 ff8d98592c3c5dc3158b873960d1f480bdf98cfd17a88648193dfd9348fe49bf SHA512 0244c465dd6c687bfe21916c9f3e29f4aae3a8bf9a5af497be6faf44b892140177f5ee3e54f1ab0526d685f93e3fc17da05a5dd3337af7770f6b707bd6bac031 WHIRLPOOL 5e714bd17935d0722fda52bf07a0d8a20b79667d7f2f4fc9f5e62d7cc7baa758c335b859bc41f0b22b1c61686a2a753d4c33b0625cf392843edc89ba7ea42e32
-EBUILD cvsps-3.10.ebuild 833 SHA256 a86021bee9c424d248fa0479dc08a87642e0fead5a69bf5e95711ede78f97e06 SHA512 26844596503713ea057c4e2d43caf6f99a287b02f9b8e2fe3894ba69093c91add03980b92f1e2b5694f538e1878d4b973af534b717d4291453ee9b73065b5976 WHIRLPOOL e164450bf224b45ce10982e480bdc61e4121949e5331b074f2a706822c7fc51927b58b616d7eb6bc8c35d0092c6552d63b9778348f3910f272a518b6d4b0b451
-EBUILD cvsps-3.13.ebuild 844 SHA256 41bddc71009bfefac3b82668394556f8d4d7fe993d1529676fb1f8ed7862b53d SHA512 ffa715e5e7dd98f56794ac7aa6fea77c45399ca94365389d9fb2b4bfcd677b3f4f180ad9d9288f518f2d7ade87724dfe4634508935eada4e24d3707cdb2f9f39 WHIRLPOOL 27ae8141ba725d670902cdc770b89747362f87130d62f4d2236dce1470d22525d3e5e844d836129b6af0f557d2c412afc2493542adfa0b2f4468afe17b8d0f3b
-MISC ChangeLog 5942 SHA256 1264971d91701cde29575f6c8f40a2ce7fd52a508ae12561b2c5d821ae132c3a SHA512 612b8015f12eb5958e4d2574e934c519f429f1727a0bcf6abbee4eead801e70cf4ae3f368f6944378a8cee6be6e5e1d80dbf8deca0af15984d691597f8c1b67d WHIRLPOOL abadadcce7a84fdad8e679a96f2d6a2f7bc3013f231843d0d7897499725049c8a4027edf8f05ab928532dd334636f35f8f179518c29ffdbe563f13ebbf282eeb
+EBUILD cvsps-3.13-r1.ebuild 1116 SHA256 f2983e80266c160b45596e9e45dfac3c41c48e70dfceefae023bc59d75e59785 SHA512 4935ccdbbf9d5c392d77b07941d4d3e6a33d50846c39a6a9c48d3d2b68f4511fd5dcdc6c092952a78cd8a54baaaeb8931807d7e6571010bdeb74e2878d142f4a WHIRLPOOL ba54b9f303debf8e9245ba808242e17480ef913e36a76ad9478309176eda6fc3d68988057fa9dae1b218ac8a9c9b9cf9a45ffd228920d49c3910af0567c7ca94
+MISC ChangeLog 6222 SHA256 ba7ead3ce92fa461fe50a0bab45804b768f2f2f42663e37856cdc1e14f569cbb SHA512 5b460862b3c135e25bacc8f990a0bdfbd1007d06b992e767bc298aa36f8c5571f5c0e98c138dd5f2cb09576eee6e96503400063fece33e4403bd0919fe8bccdb WHIRLPOOL f7f72cd48ce7794720f8af22c6fa47085f7c1f9965a19ed0e603f9912479758cbf2979f26443a08f963caa2a6417534405adae70f10c19035eda8eec92a4a56d
 MISC metadata.xml 333 SHA256 fa245216a660f9b6f33708ed269f5e3277dd759bce9592c926f0c5352c7fa9e6 SHA512 4a64d35cf639a478ac361c9ec7a8625375ffa56cc671b697154c4391cec77e7549352d71182cf9bcf341109213369b1f6b4d6fc1c3f2a2eac38a6d55114b4405 WHIRLPOOL a63b7a8a263b658c11f7d58003d130a24b7f28d8572b4b77a83e7f340079246467572f8d0ac41eb504dddb7ec31faef016b38ac5486f341f485d14b5661c2493
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTIhBmAAoJEOeBhlrCAAWGZggIAJYJUo4ZeGxYQx/daWKMCMkA
-9NDQI0KtWhx+ZtC+Qceo5h0/pgHdcsYwrj1urSFM39K+F0HhMPkjE67sFJvrzh6y
-MiK936GkmlPXffA1ZkJFjLpKGWhFda3RDYgbTQidx8VM60EQhquPxeoDRkNqKraf
-DXPjYxH9PbbnE0ZK4ZWVcGw8L22/HuNYfimv7Ha7ZCgA/UcBuniO3/AVzr4BU+73
-oCDQs5rVaV6N5qlQIivjo8tgIthP8+CWU45htfZWn9Kljug7Jsmht/dOkTg8kYaC
-Tw2wM+o6GufGT2JSk2fFUyRUKWk0w8+cJJxb2K5RKHQbdwbNIXZ/G/cFFeyv/g8=
-=N3Nc
+iEYEAREIAAYFAlP57VgACgkQcaHudmEf86phzACfaZLYDWZcEfhZcefeKWbKpGcA
+F8cAmwSbH/7eKJ2y2fpzzZ6boF9qEQyD
+=ct5k
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/cvsps/cvsps-2.1.ebuild b/dev-vcs/cvsps/cvsps-2.1.ebuild
deleted file mode 100644
index 0d1fb06501b5..000000000000
--- a/dev-vcs/cvsps/cvsps-2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.5 2014/01/20 23:35:32 vapier Exp $
-
-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 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin cvsps || die
-	doman cvsps.1
-	dodoc README CHANGELOG
-}
diff --git a/dev-vcs/cvsps/cvsps-3.10.ebuild b/dev-vcs/cvsps/cvsps-3.10.ebuild
deleted file mode 100644
index 72e0fe96777f..000000000000
--- a/dev-vcs/cvsps/cvsps-3.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-3.10.ebuild,v 1.2 2014/01/20 23:35:32 vapier Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Generates patchset information from a CVS repository"
-HOMEPAGE="http://www.catb.org/~esr/cvsps/"
-SRC_URI="http://www.catb.org/~esr/${PN}/${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 ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/asciidoc"
-
-src_prepare() {
-	tc-export CC
-	export prefix=/usr
-}
-
-src_install() {
-	default
-	dodoc README
-}
diff --git a/dev-vcs/cvsps/cvsps-3.13.ebuild b/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
index 57171ed824d3..75f9a2136d69 100644
--- a/dev-vcs/cvsps/cvsps-3.13.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
@@ -1,17 +1,17 @@
 # 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-3.13.ebuild,v 1.3 2014/03/13 20:09:09 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/cvsps-3.13-r1.ebuild,v 1.1 2014/08/24 13:49:08 slyfox Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Generates patchset information from a CVS repository"
+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="0"
+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=""
 
@@ -19,7 +19,16 @@ 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
+	MAKEOPTS+=" PROG=${gentoo_name}"
+
 	tc-export CC
 	export prefix=/usr
 }
diff --git a/dev-vcs/cvsps/files/cvsps-3.13-make.patch b/dev-vcs/cvsps/files/cvsps-3.13-make.patch
new file mode 100644
index 000000000000..7c96d60300a1
--- /dev/null
+++ b/dev-vcs/cvsps/files/cvsps-3.13-make.patch
@@ -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