From 52f1a7277cce3ffcf6add002063321bbe6f6cca5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20R=C3=BCger?= Date: Fri, 28 Aug 2015 05:29:07 +0200 Subject: [PATCH] dev-vcs/cvs2svn: Remove old Package-Manager: portage-2.2.20.1 --- dev-vcs/cvs2svn/Manifest | 6 -- dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild | 55 ---------------- dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild | 55 ---------------- dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild | 55 ---------------- dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild | 55 ---------------- dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild | 60 ----------------- dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild | 64 ------------------- .../files/2.2.0-deprecated-modules.patch | 54 ---------------- 8 files changed, 404 deletions(-) delete mode 100644 dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild delete mode 100644 dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild delete mode 100644 dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild delete mode 100644 dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild delete mode 100644 dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild delete mode 100644 dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild delete mode 100644 dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch diff --git a/dev-vcs/cvs2svn/Manifest b/dev-vcs/cvs2svn/Manifest index 99a17eb32c74..0eca2ed448af 100644 --- a/dev-vcs/cvs2svn/Manifest +++ b/dev-vcs/cvs2svn/Manifest @@ -1,8 +1,2 @@ -DIST cvs2svn-1.5.0.tar.gz 266057 SHA256 12c282757043b8ffc98443175cbac218119e92ccc73e942da447659efaf23274 SHA512 e6cbfcb541e8277091892e9ed26a35ce6fedfbf9d91659ba318bd10643ffae998a5a95d58056c56d4bdbd763f7de78e3592589a23c9ee04b6e43a6d617a09443 WHIRLPOOL 6f30dbdc6f084dfbe3e4c76a54a72dc073767ebc659d1815c672e0f6e84e4b3a0e0d89605da86d6d975c4d08b0c85c7ba956c623181a2a22ab7f568050b3d932 -DIST cvs2svn-1.5.1.tar.gz 266476 SHA256 75e97351af93ee9e4803b5285e7f18f280e0f258d7e9139a1a1bf84e34146179 SHA512 afe245ec913372bda27d4a5eb8fe41d8fff8b6f72dc9c57686c8d6144a10a0af9da7196136e1f3ed96fdb459f9e31cf6f226385ff47c0e3a63f7a0df9c0ea951 WHIRLPOOL 1ac7a61fcf5396257a06dbd5f70cab9778da673da9ac8281d77998c5ab6c1e38167a84e80313d548318128a3858f030500875e20531ff259f7b4eea54937be1c -DIST cvs2svn-2.0.1.tar.gz 344924 SHA256 323c16ba865106856f82cf8d278741735e433e6a56b00207b75408fb7ef7ebdd SHA512 e754e3fc3e960643b8fb89c6d2aa97d741a1439e59d0e6e272fa5a18d099e3be9b713ec0b41c604844f6056582e917c7d11f30b2760a9d3dc2f98080757ea034 WHIRLPOOL e731f594a5ee100c86a51d9953a3b812af76038437d82c0a76ac41c5cfb8a74b123d50ecd538714956d6d48e7d44f32e742aa8c034c4512f8dd6d0eec9d1cab6 -DIST cvs2svn-2.1.0.tar.gz 389401 SHA256 b698b8aa138d3d8af07067f47068e9279871f4edbe2864ed056cf8a5a274ed54 SHA512 d78365dc194064e9f108a2d316185acfb1d61eac75c331008f81ba76b4c4b7c329789acafa8b593eddfe97dd3a503e2dbd63d9b684d91c485a89e4b4b417602c WHIRLPOOL 3e4dd3ad7eaaaa50d6d8505e817a9a44db9f44eb81b5291547ebc0c836091050297452939b59711e861e10a18e0d359f4eb2d5228a289c87984560bc777d3a28 DIST cvs2svn-2.1.1.tar.gz 389645 SHA256 bd724fb615a5ac1ea1f7aaa62cafad3404d82b9fd1922a1028b81ad0672f9f10 SHA512 32b901ad618b42c9d58324c8c1b933a97477cad2af886bd88e1ab9742728d9986367abf9f559f7f3e7757958c32e519eb4eb08e620522d51d3961a74911efb86 WHIRLPOOL 76d04fb94b12b098a9cf5cd8466982e7cb913db9043a76bfdc593e03c984c017f1999bf49296d8b733ad3653be37738694a7c4cfb54c8f9cb5d3a6234396c436 -DIST cvs2svn-2.2.0.tar.gz 411531 SHA256 372c57cfea369637cd49fd9d685d1ebaa2e84a9cf4ad301fcc63f9cb42161bea SHA512 25a496b8ef46ecddfe94285f37fc8f0cf44a8775c6d8040c9748f21b93763416aa8831bfed7719708f4f897f455b884b59e4d1a8f766b7adf5a3195ab13b03e1 WHIRLPOOL e17fcac8d77a5a75361dba7548eed04c2079c83ea9b4066146dc8290980b5cc1d9f6a57871c492ca6add0f803090df833ab93ce1b0dec3b1cb47d1172c498acd -DIST cvs2svn-2.3.0.tar.gz 479373 SHA256 d9d835e0c7df48966fbadf51527c25ebf1343b25179e3802f4637d4b96ba363e SHA512 709a41f407fc58c939ab9cad9a06e4abcc1161cba37353a871bc0e2621a6045600a7ba76016383df57cb7f534a433148b1ce4138d5f219ee3801c8db3780df51 WHIRLPOOL 8f8605a235e430f34eb06fd1791fdc0c04aa95d15d95fbf176da6e8ecafe492debc2fd2be3c10071fc989387d8699b0bce233bb298e31630f5f636f818232c50 DIST cvs2svn-2.4.0.tar.gz 514891 SHA256 a6677fc3e7b4374020185c61c998209d691de0c1b01b53e59341057459f6f116 SHA512 726fb8a3b3261eeb6d8097973f2741aa7a433f847bcef6701a6c0b7dc3d8fb5da1726e40f008d1dffac71791b953ddb9ade5db5809c98731d78e94da6465506a WHIRLPOOL b1040b65c6d55ad3144e9ca8d358c7da6833f7990d766d32d7df3bec0949fd6fb66a1f4ccca6ec48bd4a39072deb9eb5f444e3efaee7ab299e086ee0edc72b02 diff --git a/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild deleted file mode 100644 index 830bed79bcd4..000000000000 --- a/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -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-vcs/subversion-1.0.9" -RDEPEND="${DEPEND} - dev-vcs/rcs" - -PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse" - -src_prepare() { - distutils_src_prepare - python_convert_shebangs -r 2 . -} - -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() { - distutils_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 - - testing() { - "$(PYTHON)" run-tests.py - } - python_execute_function testing -} diff --git a/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild b/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild deleted file mode 100644 index b78960dbeced..000000000000 --- a/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -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-vcs/subversion-1.0.9" -RDEPEND="${DEPEND} - dev-vcs/rcs" - -PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse" - -src_prepare() { - distutils_src_prepare - python_convert_shebangs -r 2 . -} - -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() { - distutils_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 - - testing() { - "$(PYTHON)" run-tests.py - } - python_execute_function testing -} diff --git a/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild deleted file mode 100644 index b6eabcad848b..000000000000 --- a/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -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-vcs/subversion-1.0.9" -RDEPEND="${DEPEND} - dev-vcs/rcs" - -PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse" - -src_prepare() { - distutils_src_prepare - python_convert_shebangs -r 2 . -} - -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() { - distutils_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 - - testing() { - "$(PYTHON)" run-tests.py - } - python_execute_function testing -} diff --git a/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild deleted file mode 100644 index 81f107b6873b..000000000000 --- a/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -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-vcs/subversion-1.0.9" -RDEPEND="${DEPEND} - dev-vcs/rcs" - -PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse" - -src_prepare() { - distutils_src_prepare - python_convert_shebangs -r 2 . -} - -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 - - testing() { - "$(PYTHON)" run-tests.py - } - python_execute_function testing -} - -pkg_postinst() { - distutils_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 deleted file mode 100644 index a3c9c5b5072a..000000000000 --- a/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -PYTHON_DEPEND="2" -PYTHON_USE_WITH_OR="berkdb gdbm" -PYTHON_USE_WITH_OPT="test" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -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="bazaar git test" - -DEPEND=">=dev-vcs/subversion-1.0.9" -RDEPEND="${DEPEND} - bazaar? ( >=dev-vcs/bzr-1.13 ) - git? ( >=dev-vcs/git-1.5.4.4 ) - dev-vcs/rcs" - -PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse" - -src_prepare() { - epatch "${FILESDIR}/2.2.0-deprecated-modules.patch" - distutils_src_prepare - python_convert_shebangs -r 2 . -} - -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 - - testing() { - "$(PYTHON)" -W ignore run-tests.py - } - python_execute_function testing -} - -pkg_postinst() { - distutils_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 deleted file mode 100644 index ffa6e7f0c52b..000000000000 --- a/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -PYTHON_DEPEND="2" -PYTHON_USE_WITH_OR="berkdb gdbm" -PYTHON_USE_WITH_OPT="test" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -inherit 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="bazaar git test" - -DEPEND=">=dev-vcs/subversion-1.0.9" -RDEPEND="${DEPEND} - bazaar? ( >=dev-vcs/bzr-1.13 ) - git? ( >=dev-vcs/git-1.5.4.4 ) - dev-vcs/rcs" - -PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse" - -src_prepare() { - distutils_src_prepare - python_convert_shebangs -r 2 . -} - -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 - - testing() { - "$(PYTHON)" -W ignore run-tests.py - } - python_execute_function testing -} - -pkg_postinst() { - distutils_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 deleted file mode 100644 index 94ceaa2b2fa2..000000000000 --- a/dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch +++ /dev/null @@ -1,54 +0,0 @@ -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] -- 2.26.2