summaryrefslogtreecommitdiff
path: root/dev-vcs/bzr
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-01-31 16:00:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-01-31 16:00:27 +0000
commit1db00cc6e94b90c08090bb5b8c406622946c4ae5 (patch)
treec34bf820c2809fb7e08ed5564df2a25cf759516f /dev-vcs/bzr
parent693cc9b6e847a01c1bb692153021aaf9fb0fab25 (diff)
gentoo resync 31.01.2019
Diffstat (limited to 'dev-vcs/bzr')
-rw-r--r--dev-vcs/bzr/Manifest6
-rw-r--r--dev-vcs/bzr/bzr-2.5.1-r1.ebuild90
-rw-r--r--dev-vcs/bzr/bzr-2.6.0.ebuild93
-rw-r--r--dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch33
-rw-r--r--dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch24
5 files changed, 0 insertions, 246 deletions
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 0632d8113774..9072995a227e 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,11 +1,5 @@
-AUX bzr-2.4.2-no-pyrex-citon.patch 1203 BLAKE2B f76b90e609034169b7bb39948ab3a04a2c64244e4521f3cba182179a6e1c6e513981ac7a55eec7d5380d0e8199f5d08c610bdc2cd116e31e5e4c72dfb228b9bf SHA512 e71eacf2881260739c2104ca30db16ff51d30ce9971b9887a1d9730f8bf020a33300079acb1e644e5d092cdc1c890956551e581d447ff2493a92e9645899b08e
-AUX bzr-2.5.1-sphinx-test-failures.patch 1028 BLAKE2B b35dd061a9d5567fc3942df136676bd0e59eea6dc82914805c47d4a377449c6da98b4e20544dbe546b8b54ceb48182354a5514b30424c43fa32b2437f569f29a SHA512 2b5738b36c8b83c238fcb51f20d9a96589f848d4c2c56a4975e615e8cdc3dcbbe8457f426d67293ef0a45d22cc4172e69ca8155e114c83b00237eea2c5048749
-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
-EBUILD bzr-2.5.1-r1.ebuild 2459 BLAKE2B 45d564c149ed3d5cf18c8a851c83867ba23f12b030664b261c3de2fe035316b1a8e1c94956929f0f9705bed95f3c13f7799da0a0856242e83462df051739258a SHA512 e06a318b5c742cfaa96f43ca161b80c4a8ea8d1597f85511f29882799f187c7a0e2853bcb5427f882b3274c4b2d9d58b035db772827ad257e41f2d8518937971
-EBUILD bzr-2.6.0.ebuild 2620 BLAKE2B a657288486403d51dedbc38c84160964e28259a83e3024e0e1929a81180a04ffa20cf3f5c6c9cbbcaec996711db1ec11b895c19918893371a33d632e13d63283 SHA512 10b98ec974074a78ca19ba62c1028becdf4370b86565855d8dbaaec97a2c7f1b54baa4971bfc8c8c0593f089b6b8b5e4cb7bfb978ac871d105c185ec1fbbdb6d
EBUILD bzr-2.7.0.ebuild 2611 BLAKE2B 8a05b594dad05f945eec856e496109cbbf76de7a0597aa377c21ba0885312a59cbf689a115bfa7205e5354d5b16ee1f217c5b17b9d8aed058fda0782c197ebfa SHA512 3f60cd5bdaba84b1003ffee1b69061bb372c379befebdfdfc77ea739f40792bd1d35d4f6b3be79c46dbb8e9881de5ea27a3ecd8f566a5a2d803db43746ba01b2
EBUILD bzr-2.7.1_pre.ebuild 2596 BLAKE2B d3a44f37fa78c3dc7d0aeb4303577e23af17fd23180f22e1997171cb689cbce5b8cab58cb99cdaae99ad992918c6eea71d0c4cc7bbfe634ad6f746ba6725b93a SHA512 aacd53a54c4a9427bb458f177dd93d1b4abe0b533e382a207eede33b9e88576c7fc5545092586a16f95ed6f0ac612de22f579c04e41dc05cac52bd8227718369
MISC metadata.xml 772 BLAKE2B 8f1d371a225b5b6702748efc93dde757d88a39c0a8124abc898eff891a4867c92dbc19a356b4c0726682e5304b80be333e12a981d04b0ae89e480cb2f6b6c3a3 SHA512 cc63dba9888058f60521da2fdc43697f1fc8bde194782346279560b50ceaa555b464599d28641350cd25f67aebe2f449cbe306dd651620bc891271acf8aaddac
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 7aaa0aa22229..000000000000
--- 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 9ddf9d73ddf5..000000000000
--- 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 a5128a03d628..000000000000
--- 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 ac1fd0212d6b..000000000000
--- 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)
-