diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-vcs/bzr/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-vcs/bzr/files')
-rw-r--r-- | dev-vcs/bzr/files/71bzr-gentoo.el | 5 | ||||
-rw-r--r-- | dev-vcs/bzr/files/bzr-2.4.0-no-pyrex-citon.patch | 33 | ||||
-rw-r--r-- | dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch | 33 | ||||
-rw-r--r-- | dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch | 24 |
4 files changed, 95 insertions, 0 deletions
diff --git a/dev-vcs/bzr/files/71bzr-gentoo.el b/dev-vcs/bzr/files/71bzr-gentoo.el new file mode 100644 index 000000000000..e8af05fb6ed6 --- /dev/null +++ b/dev-vcs/bzr/files/71bzr-gentoo.el @@ -0,0 +1,5 @@ + +;;; dev-util/bzr site-lisp configuration + +(unless (fboundp 'vc-bzr-registered) + (add-to-list 'load-path "@SITELISP@")) diff --git a/dev-vcs/bzr/files/bzr-2.4.0-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.4.0-no-pyrex-citon.patch new file mode 100644 index 000000000000..da5b3c881076 --- /dev/null +++ b/dev-vcs/bzr/files/bzr-2.4.0-no-pyrex-citon.patch @@ -0,0 +1,33 @@ +--- setup.py.orig 2011-08-16 17:18:11.280853205 +0200 ++++ setup.py 2011-08-16 17:20:12.597637778 +0200 +@@ -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.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.4.2-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch new file mode 100644 index 000000000000..a5128a03d628 --- /dev/null +++ b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch @@ -0,0 +1,33 @@ +--- 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 new file mode 100644 index 000000000000..ac1fd0212d6b --- /dev/null +++ b/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch @@ -0,0 +1,24 @@ +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) + |