add new version requested from bug #202233. remove old version

(Portage version: 2.1.4_rc9)

8 files changed, 96 insertions, 25 deletions

diff --git a/dev-util/cvs2svn/ChangeLog b/dev-util/cvs2svn/ChangeLog
index fec1db854295..8b56c3883436 100644
--- a/dev-util/cvs2svn/ChangeLog
+++ b/dev-util/cvs2svn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cvs2svn
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs2svn/ChangeLog,v 1.14 2007/06/03 16:56:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs2svn/ChangeLog,v 1.15 2007/12/14 14:22:31 cardoe Exp $
+
+*cvs2svn-2.0.1 (14 Dec 2007)
+*cvs2svn-1.5.1 (14 Dec 2007)
+
+  14 Dec 2007; Doug Klima <cardoe@gentoo.org> -cvs2svn-1.1.0.ebuild,
+  cvs2svn-1.5.0.ebuild, +cvs2svn-1.5.1.ebuild, +cvs2svn-2.0.1.ebuild:
+  add new version requested from bug #202233. remove old version
 
   03 Jun 2007; Raúl Porcel <armin76@gentoo.org> cvs2svn-1.5.0.ebuild:
   alpha stable wrt #159298
diff --git a/dev-util/cvs2svn/cvs2svn-1.1.0.ebuild b/dev-util/cvs2svn/cvs2svn-1.1.0.ebuild
deleted file mode 100644
index d25f6c6c85f8..000000000000
--- a/dev-util/cvs2svn/cvs2svn-1.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs2svn/cvs2svn-1.1.0.ebuild,v 1.4 2005/03/14 03:44:24 agriffis Exp $
-
-inherit distutils
-
-DESCRIPTION="convert a CVS repository to a Subversion repository"
-HOMEPAGE="http://cvs2svn.tigris.org/"
-SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/16792/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 alpha ia64"
-IUSE=""
-
-DEPEND="dev-lang/python
-	!<dev-util/subversion-1.0.9"
-RDEPEND="${DEPEND}
-	app-text/rcs"
diff --git a/dev-util/cvs2svn/cvs2svn-1.5.0.ebuild b/dev-util/cvs2svn/cvs2svn-1.5.0.ebuild
index 31523e43bcce..368dc84d5d60 100644
--- a/dev-util/cvs2svn/cvs2svn-1.5.0.ebuild
+++ b/dev-util/cvs2svn/cvs2svn-1.5.0.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs2svn/cvs2svn-1.5.0.ebuild,v 1.7 2007/06/03 16:56:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs2svn/cvs2svn-1.5.0.ebuild,v 1.8 2007/12/14 14:22:31 cardoe Exp $
 
 inherit distutils
 
+FILEVER="34574"
+
 DESCRIPTION="Convert a CVS repository to a Subversion repository"
 HOMEPAGE="http://cvs2svn.tigris.org/"
-SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/34574/cvs2svn-1.5.0.tar.gz"
+SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/${FILEVER}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/cvs2svn/cvs2svn-1.5.1.ebuild b/dev-util/cvs2svn/cvs2svn-1.5.1.ebuild
new file mode 100644
index 000000000000..a42162c6f3ce
--- /dev/null
+++ b/dev-util/cvs2svn/cvs2svn-1.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs2svn/cvs2svn-1.5.1.ebuild,v 1.1 2007/12/14 14:22:31 cardoe Exp $
+
+inherit distutils
+
+FILEVER="36129"
+
+DESCRIPTION="Convert a CVS repository to a Subversion repository"
+HOMEPAGE="http://cvs2svn.tigris.org/"
+SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/${FILEVER}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/python
+		>=dev-util/subversion-1.0.9"
+RDEPEND="${DEPEND}
+		app-text/rcs"
+
+src_install() {
+	distutils_src_install
+	insinto "/usr/share/${PN}"
+	doins -r contrib cvs2svn-example.options {profile-repos,show-db,verify-cvs2svn}.py
+	doman cvs2svn.1
+}
+
+pkg_postinst() {
+	elog "Additional scripts and examples have been installed to:"
+	elog "  ${ROOT}usr/share/${PN}/"
+}
+
+src_test() {
+	# Need this because subversion is localized, but the tests aren't
+	export LC_ALL=C
+	python run-tests.py || die "tests failed"
+}
diff --git a/dev-util/cvs2svn/cvs2svn-2.0.1.ebuild b/dev-util/cvs2svn/cvs2svn-2.0.1.ebuild
new file mode 100644
index 000000000000..d7688e63386d
--- /dev/null
+++ b/dev-util/cvs2svn/cvs2svn-2.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs2svn/cvs2svn-2.0.1.ebuild,v 1.1 2007/12/14 14:22:31 cardoe Exp $
+
+inherit distutils
+
+FILEVER="39919"
+
+DESCRIPTION="Convert a CVS repository to a Subversion repository"
+HOMEPAGE="http://cvs2svn.tigris.org/"
+SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/${FILEVER}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/python
+		>=dev-util/subversion-1.0.9"
+RDEPEND="${DEPEND}
+		app-text/rcs"
+
+src_install() {
+	distutils_src_install
+	insinto "/usr/share/${PN}"
+	doins -r contrib cvs2svn-example.options {profile-repos,show-db,verify-cvs2svn}.py
+	doman cvs2svn.1
+}
+
+pkg_postinst() {
+	elog "Additional scripts and examples have been installed to:"
+	elog "  ${ROOT}usr/share/${PN}/"
+}
+
+src_test() {
+	# Need this because subversion is localized, but the tests aren't
+	export LC_ALL=C
+	python run-tests.py || die "tests failed"
+}
diff --git a/dev-util/cvs2svn/files/digest-cvs2svn-1.1.0 b/dev-util/cvs2svn/files/digest-cvs2svn-1.1.0
deleted file mode 100644
index 97a5916d6d7d..000000000000
--- a/dev-util/cvs2svn/files/digest-cvs2svn-1.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e273e69123872f0ff55ade7cff8e7c8 cvs2svn-1.1.0.tar.gz 202291
-RMD160 c28e51aefbebbe1bf7d1ffee0866998985178dc1 cvs2svn-1.1.0.tar.gz 202291
-SHA256 8dc51835958686fc685dedbb77ad9077b37bbea7b0383162cf7f85b55240292b cvs2svn-1.1.0.tar.gz 202291
diff --git a/dev-util/cvs2svn/files/digest-cvs2svn-1.5.1 b/dev-util/cvs2svn/files/digest-cvs2svn-1.5.1
new file mode 100644
index 000000000000..929daf959e3f
--- /dev/null
+++ b/dev-util/cvs2svn/files/digest-cvs2svn-1.5.1
@@ -0,0 +1,3 @@
+MD5 d1e42ea51b373be0023f2b3f6b80ec01 cvs2svn-1.5.1.tar.gz 266476
+RMD160 25d6468f626bff33985ff5a46443f4c14f3a82a8 cvs2svn-1.5.1.tar.gz 266476
+SHA256 75e97351af93ee9e4803b5285e7f18f280e0f258d7e9139a1a1bf84e34146179 cvs2svn-1.5.1.tar.gz 266476
diff --git a/dev-util/cvs2svn/files/digest-cvs2svn-2.0.1 b/dev-util/cvs2svn/files/digest-cvs2svn-2.0.1
new file mode 100644
index 000000000000..712178813828
--- /dev/null
+++ b/dev-util/cvs2svn/files/digest-cvs2svn-2.0.1
@@ -0,0 +1,3 @@
+MD5 98c010de53adb19de6f039aa733b5bbe cvs2svn-2.0.1.tar.gz 344924
+RMD160 d512c4f24a136d28460112d75e1f820306a55caa cvs2svn-2.0.1.tar.gz 344924
+SHA256 323c16ba865106856f82cf8d278741735e433e6a56b00207b75408fb7ef7ebdd cvs2svn-2.0.1.tar.gz 344924