[gentoo-commits] repo/gentoo:master commit in: dev-vcs/bzr/, dev-vcs/bzr/files/

[Pacho Ramos]

commit:     314bc7a27a1b78a8309246f2fb1f6488d6834659
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 15:16:27 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 16:53:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bc7a2

dev-vcs/bzr: Drop old

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 dev-vcs/bzr/Manifest                               |  2 -
 dev-vcs/bzr/bzr-2.5.1-r1.ebuild                    | 90 ---------------------
 dev-vcs/bzr/bzr-2.6.0.ebuild                       | 93 ----------------------
 dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch   | 33 --------
 .../bzr/files/bzr-2.5.1-sphinx-test-failures.patch | 24 ------
 5 files changed, 242 deletions(-)

diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 4a7e92147d7..9358807171e 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,4 +1,2 @@
-DIST bzr-2.5.1.tar.gz 10451513 BLAKE2B 00025c5db2d9ad94b39fb450c83c917b532c4804897a064b4fedb02ba7e9243027f105b8b5613e5f62e17e2209c6eef7b92fe3e7c24186edd35fab257ffa334d SHA512 40700d0f4f61bb1609d85772812249114c9e7af619143aafec97163617cb58828e63bda22abf576704848b479463bb85c0b2dc7e5bb49108f48fa397c7bfe85c
-DIST bzr-2.6.0.tar.gz 11301124 BLAKE2B 63a45634e3da53b06208c96726a399edd08c5a4c43ae3e431501aa15dc8060096fb13a390d5f1a6c7cc5cf5a9dbd5245760c21ba29a060a53f74c886fd69424c SHA512 f40d4380a837321c2ed168d15b0b5d31e9de6df93c0f8f2fd9b16c9351524b0afac5b8744740f587e9704efeb4cc004cae7f35aed47f73b5c796cbe2526af980
 DIST bzr-2.7.0.tar.gz 11586410 BLAKE2B 9d61d5efa1c02667fdb93d66fc4290f279c74bff2fd0174149243563bc5013085438410221fb6565f986ef17e957b680a1bdd3142e23843b4cbc39c7855dbd98 SHA512 c39ad3715d865788da74d8de8b469e1dc93d18b6cbcbc569464cdeb9bb2173bf8d7f4f8ee8f7599fbcbbe322817a4c72e785d544e622753699c425c32597d9aa
 DIST bzr-2.7.1_pre.tar.gz 10964137 BLAKE2B d126730d782f232d6c486e31ab465a1a295de456eb59fc1db4d215529ec38e78826da1bedbe6a80af0e874188635c83742c5ae5b07c42dd968f1d0d88596a35e SHA512 b65c63dff33f1646e6db84d9307b870140c2c7b3b16cef69eb4bfb5a5a94cb1721ed74c26e6ad78232fffb4b5055cb4096d9835197db9b97f91c16e8a79658b3

diff --git a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
deleted file mode 100644
index 7aaa0aa2222..00000000000
--- a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl,xml"
-
-inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator
-
-MY_P=${PN}-${PV}
-SERIES=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bazaar is a next generation distributed version control system"
-HOMEPAGE="http://bazaar-vcs.org/"
-#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
-SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="curl doc +sftp test"
-
-RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
-	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
-
-DEPEND="test? (
-		${RDEPEND}
-		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
-		dev-python/subunit
-		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch"
-	"${FILESDIR}/${P}-sphinx-test-failures.patch"
-)
-
-python_configure_all() {
-	# Generate the locales first to avoid a race condition.
-	esetup.py build_mo
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Some tests expect the usual pyc compiling behaviour.
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Define tests which are known to fail below.
-	local skip_tests="("
-	# https://bugs.launchpad.net/bzr/+bug/850676
-	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
-	skip_tests+=")"
-	if [[ -n ${skip_tests} ]]; then
-		einfo "Skipping tests known to fail: ${skip_tests}"
-	fi
-
-	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
-		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# Fixup manpages manually; passing --install-data causes locales to be
-	# installed in /usr/share/share/locale
-	dodir /usr/share
-	mv "${ED%/}"/usr/{man,share/man} || die
-
-	dodoc doc/*.txt
-
-	if use doc; then
-		docinto developers
-		dodoc -r doc/developers/* || die
-		for doc in mini-tutorial tutorials user-{guide,reference}; do
-			docinto ${doc}
-			dodoc -r doc/en/${doc}/* || die
-		done
-	fi
-
-	dobashcomp contrib/bash/bzr || die
-}

diff --git a/dev-vcs/bzr/bzr-2.6.0.ebuild b/dev-vcs/bzr/bzr-2.6.0.ebuild
deleted file mode 100644
index 9ddf9d73ddf..00000000000
--- a/dev-vcs/bzr/bzr-2.6.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl,xml"
-
-MY_P=${PN}-${PV}
-
-DESCRIPTION="Bazaar is a next generation distributed version control system"
-HOMEPAGE="http://bazaar-vcs.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="curl doc +sftp test"
-PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
-
-inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator l10n
-SERIES=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
-
-RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
-	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
-
-DEPEND="test? (
-		${RDEPEND}
-		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
-		dev-python/subunit
-		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# Fails tests bug#487216
-# Upstream is not exactly keen on fixing it
-RESTRICT="test"
-
-python_configure_all() {
-	rm_loc() {
-		rm "${S}"/po/$1.po || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-	# Generate the locales first to avoid a race condition.
-	esetup.py build_mo
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Some tests expect the usual pyc compiling behaviour.
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Define tests which are known to fail below.
-	local skip_tests="("
-	# https://bugs.launchpad.net/bzr/+bug/850676
-	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
-	skip_tests+=")"
-	if [[ -n ${skip_tests} ]]; then
-		einfo "Skipping tests known to fail: ${skip_tests}"
-	fi
-
-	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
-		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# Fixup manpages manually; passing --install-data causes locales to be
-	# installed in /usr/share/share/locale
-	dodir /usr/share
-	mv "${ED%/}"/usr/{man,share/man} || die
-
-	dodoc doc/*.txt
-
-	if use doc; then
-		docinto developers
-		dodoc -r doc/developers/* || die
-		for doc in mini-tutorial tutorials user-{guide,reference}; do
-			docinto ${doc}
-			dodoc -r doc/en/${doc}/* || die
-		done
-	fi
-
-	dobashcomp contrib/bash/bzr || die
-}

diff --git a/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
deleted file mode 100644
index a5128a03d62..00000000000
--- a/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- setup.py.orig	2011-12-26 12:42:40.308882969 +0100
-+++ setup.py	2011-12-26 12:43:38.861854988 +0100
-@@ -178,28 +178,8 @@
- from distutils.errors import CCompilerError, DistutilsPlatformError
- from distutils.extension import Extension
- ext_modules = []
--try:
--    try:
--        from Cython.Distutils import build_ext
--        from Cython.Compiler.Version import version as pyrex_version
--    except ImportError:
--        print("No Cython, trying Pyrex...")
--        from Pyrex.Distutils import build_ext
--        from Pyrex.Compiler.Version import version as pyrex_version
--except ImportError:
--    have_pyrex = False
--    # try to build the extension from the prior generated source.
--    print("")
--    print("The python package 'Pyrex' is not available."
--          " If the .c files are available,")
--    print("they will be built,"
--          " but modifying the .pyx files will not rebuild them.")
--    print("")
--    from distutils.command.build_ext import build_ext
--else:
--    have_pyrex = True
--    pyrex_version_info = tuple(map(int, pyrex_version.rstrip("+").split('.')))
--
-+have_pyrex = False
-+from distutils.command.build_ext import build_ext
- 
- class build_ext_if_possible(build_ext):
- 

diff --git a/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch b/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch
deleted file mode 100644
index ac1fd0212d6..00000000000
--- a/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream revno 6523 ((vila) Avoid test sphinx-related failures now
-that we don't have direct sphinx anymore. (Vincent Ladeuil))
-
-=== modified file 'bzrlib/tests/test_utextwrap.py'
---- bzrlib/tests/test_utextwrap.py	2011-05-28 06:44:01 +0000
-+++ bzrlib/tests/test_utextwrap.py	2012-04-17 12:18:27 +0000
-@@ -171,16 +171,6 @@
- 
- 
-     def setup_both(testcase, base_class, reused_class):
--
--        if (features.sphinx.available()):
--            # Until https://bitbucket.org/birkenfeld/sphinx/issue/706 is fixed,
--            # we can't run these tests when sphinx <= 1.0.1 as it breaks
--            # textwrap.TextWrapper.wordsep_re
--            version = tuple(map(int,
--                                features.sphinx.module.__version__.split('.')))
--            if version <= (1, 0, 7):
--                raise tests.TestSkipped(
--                    'sphinx textwrap monkeypatch breaks utextwrap')
-         super(base_class, testcase).setUp()
-         override_textwrap_symbols(testcase)
-         reused_class.setUp(testcase)
-