summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2010-03-26 20:24:46 +0000
committerSebastian Pipping <sping@gentoo.org>2010-03-26 20:24:46 +0000
commit0d0ed06576e3da57b8fa6d6db35287b970b608d1 (patch)
tree42aeb3a4e594060b86b4c82275e17fd28da5fde5
parentDrop mask for gcc-config-1.5. It seems to work after some fixes, but it's st... (diff)
downloadgentoo-2-0d0ed06576e3da57b8fa6d6db35287b970b608d1.tar.gz
gentoo-2-0d0ed06576e3da57b8fa6d6db35287b970b608d1.tar.bz2
gentoo-2-0d0ed06576e3da57b8fa6d6db35287b970b608d1.zip
dev-vcs/cvs2svn: New package (copied from dev-util/cvs2svn)
(Portage version: 2.2_rc67_p26/cvs/Linux i686, RepoMan options: --force)
-rw-r--r--dev-vcs/cvs2svn/ChangeLog129
-rw-r--r--dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild39
-rw-r--r--dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild39
-rw-r--r--dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild39
-rw-r--r--dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild39
-rw-r--r--dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild39
-rw-r--r--dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild48
-rw-r--r--dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild48
-rw-r--r--dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch54
-rw-r--r--dev-vcs/cvs2svn/metadata.xml11
10 files changed, 485 insertions, 0 deletions
diff --git a/dev-vcs/cvs2svn/ChangeLog b/dev-vcs/cvs2svn/ChangeLog
new file mode 100644
index 000000000000..91b5095ac85d
--- /dev/null
+++ b/dev-vcs/cvs2svn/ChangeLog
@@ -0,0 +1,129 @@
+# ChangeLog for dev-vcs/cvs2svn
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/ChangeLog,v 1.1 2010/03/26 20:24:46 sping Exp $
+
+ 26 Mar 2010; Sebastian Pipping <sping@gentoo.org>
+ +files/2.2.0-deprecated-modules.patch, +cvs2svn-1.5.0.ebuild,
+ +cvs2svn-1.5.1.ebuild, +cvs2svn-2.0.1.ebuild, +cvs2svn-2.1.0.ebuild,
+ +cvs2svn-2.1.1.ebuild, +cvs2svn-2.2.0.ebuild, +cvs2svn-2.3.0.ebuild,
+ +metadata.xml:
+ New package (copied from dev-util/cvs2svn)
+
+*cvs2svn-2.3.0 (24 Mar 2010)
+
+ 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +cvs2svn-2.3.0.ebuild:
+ Bug #306821: version bump.
+
+ 05 Mar 2010; Ulrich Mueller <ulm@gentoo.org> cvs2svn-1.5.0.ebuild,
+ cvs2svn-1.5.1.ebuild, cvs2svn-2.0.1.ebuild, cvs2svn-2.1.0.ebuild,
+ cvs2svn-2.1.1.ebuild, cvs2svn-2.2.0.ebuild:
+ Update dev-vcs/rcs dependency after package move, bug 56967.
+
+ 08 Feb 2010; Peter Volkov <pva@gentoo.org> cvs2svn-2.2.0.ebuild:
+ Add inherit eutils for epatch.
+
+ 15 Jan 2010; Christian Faulhammer <fauli@gentoo.org> cvs2svn-2.2.0.ebuild:
+ Transfer Prefix keywords
+
+ 28 May 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+ give up the package to some people that want it
+
+ 27 May 2009; Petteri Räty <betelgeuse@gentoo.org>
+ +files/2.2.0-deprecated-modules.patch, cvs2svn-2.2.0.ebuild:
+ Fix src_test and don't use deprecated modules in python >= 2.5. Fixes bug
+ #247023.
+
+*cvs2svn-2.2.0 (01 Feb 2009)
+
+ 01 Feb 2009; Hans de Graaff <graaff@gentoo.org> +cvs2svn-2.2.0.ebuild:
+ Version bump as discussed in #247023. Thanks to Sven for providing the ebuild.
+
+ 19 Nov 2008; Raúl Porcel <armin76@gentoo.org> cvs2svn-2.1.1.ebuild:
+ ia64 stable wrt #246644
+
+ 18 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+ cvs2svn-2.1.1.ebuild:
+ ppc stable, bug #246644
+
+ 16 Nov 2008; Tobias Klausmann <klausman@gentoo.org> cvs2svn-2.1.1.ebuild:
+ Stable on alpha, bug #246644
+
+ 15 Nov 2008; Markus Meier <maekke@gentoo.org> cvs2svn-2.1.1.ebuild:
+ amd64/x86 stable, bug #246644
+
+*cvs2svn-2.1.1 (21 Aug 2008)
+
+ 21 Aug 2008; Doug Goldstein <cardoe@gentoo.org> +cvs2svn-2.1.1.ebuild:
+ version bump. bug #219415
+
+ 09 Jun 2008; Mike Frysinger <vapier@gentoo.org> cvs2svn-2.1.0.ebuild:
+ Remove duplicate src_test, update old doins line, and do not mention ROOT
+ in pkg_postinst.
+
+*cvs2svn-2.1.0 (18 Mar 2008)
+
+ 18 Mar 2008; Doug Goldstein <cardoe@gentoo.org> +cvs2svn-2.1.0.ebuild:
+ version bump. bug #213802
+
+*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
+
+ 26 Mar 2007; Raúl Porcel <armin76@gentoo.org> cvs2svn-1.5.0.ebuild:
+ ia64 stable wrt bug 159298
+
+ 26 Mar 2007; Doug Goldstein <cardoe@gentoo.org> cvs2svn-1.5.0.ebuild:
+ Fix up Subversion depends
+
+ 06 Feb 2007; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+ Since Aron retired, I'll take over
+
+ 31 Jan 2007; Doug Goldstein <cardoe@gentoo.org> cvs2svn-1.5.0.ebuild:
+ amd64 stable
+
+ 21 Jan 2007; Andrej Kacian <ticho@gentoo.org> cvs2svn-1.5.0.ebuild:
+ Stable on x86, bug #159298.
+
+ 17 Nov 2006; Tiziano Müller <dev-zero@gentoo.org> cvs2svn-1.5.0.ebuild:
+ Manpage added. Example- and contrib-scripts added.
+
+*cvs2svn-1.5.0 (17 Nov 2006)
+
+ 17 Nov 2006; Tiziano Müller <dev-zero@gentoo.org> -cvs2svn-1.2.1.ebuild,
+ -cvs2svn-1.3.0.ebuild, +cvs2svn-1.5.0.ebuild:
+ Version bump. Dropped old versions.
+
+*cvs2svn-1.3.0 (29 Aug 2005)
+
+ 29 Aug 2005; Seemant Kulleen <seemant@gentoo.org> +cvs2svn-1.3.0.ebuild:
+ version bump to newest upstream release -- this release fixes a _lot_ of
+ bugs, but one of the tests in the testsuite fails -- known issue and
+ upstream is aware of it. Thanks a bunch to both Brian Fitzpatrick and Karl
+ Fogel (upstream authors) for this release.
+
+ 07 May 2005; David Holm <dholm@gentoo.org> cvs2svn-1.2.1.ebuild:
+ Added to ~ppc.
+
+*cvs2svn-1.2.1 (14 Mar 2005)
+
+ 14 Mar 2005; Aron Griffis <agriffis@gentoo.org> cvs2svn-1.1.0.ebuild,
+ +cvs2svn-1.2.1.ebuild:
+ Mark 1.1.0 stable. Bump to 1.2.1 #78644
+
+ 05 Nov 2004; Aron Griffis <agriffis@gentoo.org> cvs2svn-1.1.0.ebuild:
+ add rcs dep; this script uses rcs to read directly from the cvs repo
+
+*cvs2svn-1.1.0 (05 Nov 2004)
+
+ 05 Nov 2004; Aron Griffis <agriffis@gentoo.org> +metadata.xml,
+ +cvs2svn-1.1.0.ebuild:
+ New ebuild for cvs2svn. I'm not sure when this was separated from
+ subversion proper, but it isn't present in 1.0.9 which is stable on
+ all arches.
+
diff --git a/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild
new file mode 100644
index 000000000000..872f3d27ac0c
--- /dev/null
+++ b/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild,v 1.1 2010/03/26 20:24:46 sping 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/${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}
+ dev-vcs/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-vcs/cvs2svn/cvs2svn-1.5.1.ebuild b/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild
new file mode 100644
index 000000000000..0265ab13e3cd
--- /dev/null
+++ b/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild,v 1.1 2010/03/26 20:24:46 sping 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}
+ dev-vcs/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-vcs/cvs2svn/cvs2svn-2.0.1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild
new file mode 100644
index 000000000000..0d06cc352511
--- /dev/null
+++ b/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild,v 1.1 2010/03/26 20:24:46 sping 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}
+ dev-vcs/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-vcs/cvs2svn/cvs2svn-2.1.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild
new file mode 100644
index 000000000000..aaf11c58ca18
--- /dev/null
+++ b/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild,v 1.1 2010/03/26 20:24:46 sping Exp $
+
+inherit distutils
+
+FILEVER="41596"
+
+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}
+ dev-vcs/rcs"
+
+src_install() {
+ distutils_src_install
+ insinto "/usr/share/${PN}"
+ doins -r contrib cvs2svn-example.options
+ doman cvs2svn.1
+}
+
+src_test() {
+ # Need this because subversion is localized, but the tests aren't
+ export LC_ALL=C
+ python run-tests.py || die "tests failed"
+}
+
+pkg_postinst() {
+ elog "Additional scripts and examples have been installed to:"
+ elog " /usr/share/${PN}/"
+}
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild
new file mode 100644
index 000000000000..015f9a5c68f8
--- /dev/null
+++ b/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild,v 1.1 2010/03/26 20:24:46 sping Exp $
+
+inherit distutils
+
+FILEVER="42521"
+
+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}
+ dev-vcs/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
+}
+
+src_test() {
+ # Need this because subversion is localized, but the tests aren't
+ export LC_ALL=C
+ python run-tests.py || die "tests failed"
+}
+
+pkg_postinst() {
+ elog "Additional scripts and examples have been installed to:"
+ elog " /usr/share/${PN}/"
+}
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild
new file mode 100644
index 000000000000..351af1bd8eb8
--- /dev/null
+++ b/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild,v 1.1 2010/03/26 20:24:46 sping Exp $
+
+EAPI="2"
+PYTHON_USE_WITH_OR="berkdb gdbm"
+PYTHON_USE_WITH_OPT="test"
+
+inherit eutils distutils
+
+FILEVER="44372"
+
+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 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+DEPEND="dev-lang/python
+ >=dev-util/subversion-1.0.9"
+RDEPEND="${DEPEND}
+ dev-vcs/rcs"
+
+src_prepare() {
+ epatch "${FILESDIR}/2.2.0-deprecated-modules.patch"
+ distutils_src_prepare
+}
+
+src_install() {
+ distutils_src_install
+ insinto "/usr/share/${PN}"
+ doins -r contrib cvs2svn-example.options
+ doman cvs2svn.1
+}
+
+src_test() {
+ # Need this because subversion is localized, but the tests aren't
+ export LC_ALL=C
+ python -W ignore run-tests.py || die "tests failed"
+}
+
+pkg_postinst() {
+ elog "Additional scripts and examples have been installed to:"
+ elog " /usr/share/${PN}/"
+}
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild
new file mode 100644
index 000000000000..60963ef5c4c0
--- /dev/null
+++ b/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild,v 1.1 2010/03/26 20:24:46 sping Exp $
+
+EAPI="2"
+PYTHON_USE_WITH_OR="berkdb gdbm"
+PYTHON_USE_WITH_OPT="test"
+
+inherit eutils distutils
+
+FILEVER="46528"
+
+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 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+DEPEND="dev-lang/python
+ >=dev-util/subversion-1.0.9"
+RDEPEND="${DEPEND}
+ dev-vcs/rcs"
+
+src_compile() {
+ distutils_src_compile
+ emake man
+}
+
+src_install() {
+ distutils_src_install
+ insinto "/usr/share/${PN}"
+ doins -r contrib cvs2{svn,git,bzr}-example.options
+ doman *.1
+}
+
+src_test() {
+ # Need this because subversion is localized, but the tests aren't
+ export LC_ALL=C
+ python -W ignore run-tests.py || die "tests failed"
+}
+
+pkg_postinst() {
+ elog "Additional scripts and examples have been installed to:"
+ elog " /usr/share/${PN}/"
+}
diff --git a/dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch b/dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch
new file mode 100644
index 000000000000..94ceaa2b2fa2
--- /dev/null
+++ b/dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch
@@ -0,0 +1,54 @@
+Index: cvs2svn_lib/dumpfile_delegate.py
+===================================================================
+--- cvs2svn_lib/dumpfile_delegate.py (revision 4808)
++++ cvs2svn_lib/dumpfile_delegate.py (working copy)
+@@ -16,9 +16,11 @@
+
+ """This module contains database facilities used by cvs2svn."""
+
++try:
++ from hashlib import md5
++except ImportError:
++ from md5 import new as md5
+
+-import md5
+-
+ from cvs2svn_lib import config
+ from cvs2svn_lib.common import FatalError
+ from cvs2svn_lib.common import InternalError
+@@ -320,7 +322,7 @@
+ self.dumpfile.write(prop_contents)
+
+ # Insert the rev contents, calculating length and checksum as we go.
+- checksum = md5.new()
++ checksum = md5()
+ length = 0
+ if buf is None:
+ buf = stream.read(config.PIPE_READ_SIZE)
+Index: cvs2svn_lib/metadata_database.py
+===================================================================
+--- cvs2svn_lib/metadata_database.py (revision 4808)
++++ cvs2svn_lib/metadata_database.py (working copy)
+@@ -16,9 +16,11 @@
+
+ """This module contains classes to manage CVSRevision metadata."""
+
++try:
++ from hashlib import sha1
++except ImportError:
++ from sha import new as sha1
+
+-import sha
+-
+ from cvs2svn_lib.context import Ctx
+ from cvs2svn_lib.database import IndexedDatabase
+ from cvs2svn_lib.key_generator import KeyGenerator
+@@ -86,7 +88,7 @@
+ if not Ctx().cross_branch_commits:
+ key.append(branch_name or '')
+
+- digest = sha.new('\0'.join(key)).digest()
++ digest = sha1('\0'.join(key)).digest()
+ try:
+ # See if it is already known:
+ return self._digest_to_id[digest]
diff --git a/dev-vcs/cvs2svn/metadata.xml b/dev-vcs/cvs2svn/metadata.xml
new file mode 100644
index 000000000000..e9760487284b
--- /dev/null
+++ b/dev-vcs/cvs2svn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+ <email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer>
+ <email>betelgeuse@gentoo.org</email>
+</maintainer>
+</pkgmetadata>