From: Mikle Kolyada Date: Mon, 27 Apr 2020 08:24:42 +0000 (+0300) Subject: dev-vcs/bzr: remove last-rited pkg and co. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d2ed8e7669b174bcf9758f6c81bb1daad9d6c1c;p=gentoo.git dev-vcs/bzr: remove last-rited pkg and co. Closes: https://bugs.gentoo.org/show_bug.cgi?id=506772 Closes: https://bugs.gentoo.org/show_bug.cgi?id=697604 Closes: https://bugs.gentoo.org/show_bug.cgi?id=715044 Signed-off-by: Mikle Kolyada --- diff --git a/dev-vcs/bzr-rewrite/Manifest b/dev-vcs/bzr-rewrite/Manifest deleted file mode 100644 index 3662acd35e25..000000000000 --- a/dev-vcs/bzr-rewrite/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bzr-rewrite-0.6.3.tar.gz 33045 BLAKE2B 93a884ad225bf6953be8b052500a5a98b36b98b434c1afb1f73548e898f60b6716e974bbe0bb2bae54ca57713889169bdad11365759ca34bad96e4b2c97e0891 SHA512 f1a55307e80090dcc3739e4b111e08b02e4c4ec07ed479a5ac28d2d40535a699492eba785c142d8f6396032ed9db143d86dc68dac5280c071b79a9818ac69250 diff --git a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild deleted file mode 100644 index 1790ef8f80ef..000000000000 --- a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Bazaar plugin that adds support for rebasing, similar to git rebase" -HOMEPAGE="https://launchpad.net/bzr-rewrite" -SRC_URI="https://launchpad.net/bzr-rewrite/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 x86" -IUSE="" - -DEPEND=">=dev-vcs/bzr-2.5.0 - !dev-vcs/bzr-rebase" -RDEPEND="${DEPEND} - ! - - - - - bzr-rewrite - - diff --git a/dev-vcs/bzr-xmloutput/Manifest b/dev-vcs/bzr-xmloutput/Manifest deleted file mode 100644 index b19b458ef160..000000000000 --- a/dev-vcs/bzr-xmloutput/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bzr-xmloutput-0.8.8.tar.gz 49969 BLAKE2B 728783e8d68063c639d153b334116c109f90493d80f7384f4e25deceb97e67843ad27676ac70403124163ebec745adf58fdda38515db3932ff87684e60537377 SHA512 9eb87ba86dd45b7132eca69ef6e52726d7ee2d9211cc3052655e40f5cee2b99e160336c347ddce7ad912c0027e8b6a05ca542f70733d2e3493922cfa311b38ef diff --git a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r3.ebuild b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r3.ebuild deleted file mode 100644 index 3cafe5224888..000000000000 --- a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 - -DESCRIPTION="Bazaar plugin providing an option to generate XML output for builtin commands" -HOMEPAGE="http://bazaar-vcs.org/XMLOutput" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND=" - $(python_gen_cond_dep ' - dev-vcs/bzr[${PYTHON_MULTI_USEDEP}] - ')" - -PATCHES=( "${FILESDIR}"/${P}_remove-relative-imports.patch ) - -pkg_setup() { - python-single-r1_pkg_setup -} diff --git a/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch b/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch deleted file mode 100644 index b21eef05d2ad..000000000000 --- a/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch +++ /dev/null @@ -1,220 +0,0 @@ -revno: 160 [merge] -author: Jelmer Vernooij -committer: Guillermo Gonzalez -branch nick: trunk -timestamp: Mon 2011-12-19 18:45:35 -0300 -message: - Removes the use of relative imports and avoids using lazy_import in a few places we're it doesn't make a difference. - -Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=418969 -Upstream bug: https://bugs.launchpad.net/bzr-xmloutput/+bug/955329 -Commit: http://bazaar.launchpad.net/~verterok/bzr-xmloutput/trunk/revision/160 - ---- cmds.py 2011-03-09 23:19:41 +0000 -+++ cmds.py 2011-12-12 15:11:38 +0000 -@@ -22,36 +22,39 @@ - - import info - import bzrlib -+from bzrlib.option import Option -+from bzrlib.commands import ( -+ Command, -+ display_command, -+ ) - from bzrlib.lazy_import import lazy_import - lazy_import(globals(), """ - import sys - from bzrlib import ( - builtins, - bzrdir, -- commands, -- option, - log, - workingtree, - errors - ) - --from bzrlib.option import Option, custom_help --from bzrlib.commands import display_command --import logxml --import service -+from bzrlib.plugins.xmloutput import ( -+ logxml, -+ service, -+ ) - import socket --from xml_errors import handle_error_xml - """) - -+from bzrlib.plugins.xmloutput.xml_errors import handle_error_xml - - version_info = info.bzr_plugin_version - plugin_name = info.bzr_plugin_name - --null_option = option.Option('null', -- help='Write an ascii NUL (\\0) as the final char.') -- -- --class cmd_xmlstatus(commands.Command): -+null_option = Option('null', -+ help='Write an ascii NUL (\\0) as the final char.') -+ -+ -+class cmd_xmlstatus(Command): - """Display status summary. - - This reports on versioned and unknown files, reporting them -@@ -118,7 +121,7 @@ - self.outf.write('\n') - - --class cmd_xmlannotate(commands.Command): -+class cmd_xmlannotate(Command): - """Show the origin of each line in a file. - - This prints out the given file with an annotation on the left side -@@ -176,7 +179,7 @@ - branch.unlock() - - --class cmd_xmlmissing(commands.Command): -+class cmd_xmlmissing(Command): - """Show unmerged/unpulled revisions between two branches. - - OTHER_BRANCH may be local or remote. -@@ -212,7 +215,7 @@ - self.outf.write('\n') - - --class cmd_xmlinfo(commands.Command): -+class cmd_xmlinfo(Command): - """Show information about a working tree, branch or repository. - - This command will show all known locations and formats associated to the -@@ -247,7 +250,7 @@ - self.outf.write('\n') - - --class cmd_xmlplugins(commands.Command): -+class cmd_xmlplugins(Command): - """List the installed plugins. - - This command displays the list of installed plugins including -@@ -284,7 +287,7 @@ - self.outf.write('\n') - - --class cmd_xmlversion(commands.Command): -+class cmd_xmlversion(Command): - """Show version of bzr.""" - hidden = True - encoding_type = 'replace' -@@ -383,7 +386,7 @@ - self.outf.write('\0') - self.outf.write('\n') - --class cmd_start_xmlrpc(commands.Command): -+class cmd_start_xmlrpc(Command): - """Start the xmlrpc service.""" - - hidden = True -@@ -413,7 +416,7 @@ - self.server.shutdown() - - --class cmd_stop_xmlrpc(commands.Command): -+class cmd_stop_xmlrpc(Command): - """Stops a xmlrpc service.""" - - hidden = True - ---- infoxml.py 2009-07-28 03:43:56 +0000 -+++ infoxml.py 2011-12-12 15:11:38 +0000 -@@ -27,6 +27,7 @@ - - __all__ = ['show_bzrdir_info_xml'] - -+from bzrlib import info - from bzrlib.lazy_import import lazy_import - lazy_import(globals(), """ - import os, sys, time -@@ -36,7 +37,6 @@ - errors, - osutils, - urlutils, -- info, - missing, - ) - """) - ---- logxml.py 2010-12-15 18:27:12 +0000 -+++ logxml.py 2011-12-12 15:11:38 +0000 -@@ -1,14 +1,12 @@ - # -*- encoding: utf-8 -*- - --import os -- -+from bzrlib import log - from bzrlib.lazy_import import lazy_import - lazy_import(globals(), """ - import bzrlib - from bzrlib import ( - debug, - osutils, -- log, - ) - """) - - ---- lsxml.py 2011-03-09 23:41:22 +0000 -+++ lsxml.py 2011-12-12 15:11:38 +0000 -@@ -19,8 +19,6 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - # - --import os -- - from bzrlib.lazy_import import lazy_import - lazy_import(globals(), """ - from bzrlib import bzrdir, errors, osutils - ---- service.py 2010-02-23 23:38:02 +0000 -+++ service.py 2011-12-12 15:11:38 +0000 -@@ -20,6 +20,8 @@ - # - """ xmlrpc service module """ - -+import os -+ - from bzrlib.lazy_import import lazy_import - lazy_import(globals(), """ - import bzrlib -@@ -30,14 +32,13 @@ - osutils - ) - import sys --import os - import codecs - import logging - import traceback - from cStringIO import StringIO - """) - --from xml_errors import XMLError -+from bzrlib.plugins.xmloutput.xml_errors import XMLError - from xmlrpclib import Fault, Binary - from SimpleXMLRPCServer import SimpleXMLRPCServer - - ---- statusxml.py 2010-12-15 18:27:12 +0000 -+++ statusxml.py 2011-12-12 15:11:38 +0000 -@@ -33,7 +33,7 @@ - trace, - ) - --import logxml -+from bzrlib.plugins.xmloutput import logxml - """) - - from writer import _escape_cdata - diff --git a/dev-vcs/bzr-xmloutput/metadata.xml b/dev-vcs/bzr-xmloutput/metadata.xml deleted file mode 100644 index 1cdf0a3530fa..000000000000 --- a/dev-vcs/bzr-xmloutput/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - bzr-xmloutput - - diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest deleted file mode 100644 index 9358807171ec..000000000000 --- a/dev-vcs/bzr/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild deleted file mode 100644 index 73026799b43f..000000000000 --- a/dev-vcs/bzr/bzr-2.7.0.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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 sparc x86 ~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/* - for doc in mini-tutorial tutorials user-{guide,reference}; do - docinto ${doc} - dodoc -r doc/en/${doc}/* - done - fi - - dobashcomp contrib/bash/bzr || die -} diff --git a/dev-vcs/bzr/bzr-2.7.1_pre.ebuild b/dev-vcs/bzr/bzr-2.7.1_pre.ebuild deleted file mode 100644 index c39f0b24d9d6..000000000000 --- a/dev-vcs/bzr/bzr-2.7.1_pre.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads,ssl,xml" - -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 ~sparc ~x86 ~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 flag-o-matic l10n -#SERIES=$(get_version_component_range 1-2) -SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz" - -RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] ) - sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )" - -DEPEND="|| ( dev-python/cython[${PYTHON_USEDEP}] dev-python/pyrex[${PYTHON_USEDEP}] ) - test? ( ${RDEPEND} - >=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}] - dev-python/subunit - >=dev-python/testtools-0.9.5[${PYTHON_USEDEP}] )" - -# 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/* - for doc in mini-tutorial tutorials user-{guide,reference}; do - docinto ${doc} - dodoc -r doc/en/${doc}/* - done - fi - - dobashcomp contrib/bash/bzr || die -} diff --git a/dev-vcs/bzr/metadata.xml b/dev-vcs/bzr/metadata.xml deleted file mode 100644 index f366de71c752..000000000000 --- a/dev-vcs/bzr/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - Bazaar (``bzr``) is a decentralized revision control system, designed to be - easy for developers and end users alike. Bazaar is part of the GNU project - to develop a complete free operating system. - Bazaar was formerly known as Bazaar-NG. It's the successor to ``baz``, a - fork of GNU arch, but shares no code. (To upgrade from Baz, use the - ``baz-import`` command in the bzrtools plugin.) - - - Enable sftp support - - - bzr - - diff --git a/dev-vcs/bzrtools/Manifest b/dev-vcs/bzrtools/Manifest deleted file mode 100644 index 738cb3bbb533..000000000000 --- a/dev-vcs/bzrtools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bzrtools-2.5.tar.gz 74508 BLAKE2B 8e864cc0bd1fa05325502fe6772d57aba29613d56160cf356a8a38417a4c8516f98d2f32798c2511baf06a5222a1a7ac3b58fb30b5f09088c1ef19356c4e15c4 SHA512 5bc07715a3ed525a9bed5b789ea7a4079c9a56a8ce798b2eff56b27e6eae574fac23b8cc96529a5ea44b8d4ce02c512a7e22d21f046801461ba38a8d2050aa16 diff --git a/dev-vcs/bzrtools/bzrtools-2.5.ebuild b/dev-vcs/bzrtools/bzrtools-2.5.ebuild deleted file mode 100644 index d0c4f09363fe..000000000000 --- a/dev-vcs/bzrtools/bzrtools-2.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 eutils versionator - -DESCRIPTION="bzrtools is a useful collection of utilities for bzr" -HOMEPAGE="http://bazaar-vcs.org/BzrTools" -SRC_URI="https://launchpad.net/${PN}/stable/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="" -#IUSE="test" - -RDEPEND=">=dev-vcs/bzr-2.4" -DEPEND="${RDEPEND}" -# test? ( dev-python/testtools )" - -RESTRICT="test" - -S="${WORKDIR}/${PN}" - -DOCS=( AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.heads TODO.Shelf ) diff --git a/dev-vcs/bzrtools/metadata.xml b/dev-vcs/bzrtools/metadata.xml deleted file mode 100644 index 1904d7e46063..000000000000 --- a/dev-vcs/bzrtools/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - bzrtools - -