From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../django/files/django-1.4.19-bashcomp.patch | 37 ++++++++++++++++++++++ dev-python/django/files/django-1.5-py3tests.patch | 22 +++++++++++++ dev-python/django/files/django-1.5.4-objects.patch | 31 ++++++++++++++++++ dev-python/django/files/django-1.6-objects.patch | 18 +++++++++++ .../django/files/django-1.6.10-bashcomp.patch | 35 ++++++++++++++++++++ .../django/files/django-1.7.6-bashcomp.patch | 34 ++++++++++++++++++++ 6 files changed, 177 insertions(+) create mode 100644 dev-python/django/files/django-1.4.19-bashcomp.patch create mode 100644 dev-python/django/files/django-1.5-py3tests.patch create mode 100644 dev-python/django/files/django-1.5.4-objects.patch create mode 100644 dev-python/django/files/django-1.6-objects.patch create mode 100644 dev-python/django/files/django-1.6.10-bashcomp.patch create mode 100644 dev-python/django/files/django-1.7.6-bashcomp.patch (limited to 'dev-python/django/files') diff --git a/dev-python/django/files/django-1.4.19-bashcomp.patch b/dev-python/django/files/django-1.4.19-bashcomp.patch new file mode 100644 index 000000000000..26d5f7ee1405 --- /dev/null +++ b/dev-python/django/files/django-1.4.19-bashcomp.patch @@ -0,0 +1,37 @@ + extras/django_bash_completion | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +diff --git a/extras/django_bash_completion b/extras/django_bash_completion +old mode 100755 +new mode 100644 +index 1c3887e..748227d +--- a/extras/django_bash_completion ++++ b/extras/django_bash_completion +@@ -37,7 +37,7 @@ _django_completion() + COMP_CWORD=$COMP_CWORD \ + DJANGO_AUTO_COMPLETE=1 $1 ) ) + } +-complete -F _django_completion -o default django-admin.py manage.py django-admin ++complete -F _django_completion -o default django-admin.py django-admin + + _python_django_completion() + { +@@ -55,18 +55,3 @@ _python_django_completion() + fi + fi + } +- +-# Support for multiple interpreters. +-unset pythons +-if command -v whereis &>/dev/null; then +- python_interpreters=$(whereis python | cut -d " " -f 2-) +- for python in $python_interpreters; do +- pythons="${pythons} $(basename -- $python)" +- done +- pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ") +-else +- pythons=python +-fi +- +-complete -F _python_django_completion -o default $pythons +- diff --git a/dev-python/django/files/django-1.5-py3tests.patch b/dev-python/django/files/django-1.5-py3tests.patch new file mode 100644 index 000000000000..16b2cc209c0c --- /dev/null +++ b/dev-python/django/files/django-1.5-py3tests.patch @@ -0,0 +1,22 @@ +https://code.djangoproject.com/ticket/20514 +diff -ur Django-1.5.orig/django/contrib/gis/tests/test_measure.py Django-1.5/django/contrib/gis/tests/test_measure.py +--- django/contrib/gis/tests/test_measure.py 2013-02-27 03:04:14.000000000 +0800 ++++ django/contrib/gis/tests/test_measure.py 2013-05-28 04:40:18.983011224 +0800 +@@ -40,7 +40,7 @@ + "Testing access in different units" + d = D(m=100) + self.assertEqual(d.km, 0.1) +- self.assertAlmostEqual(d.ft, 328.084, 3) ++ self.assertAlmostEqual(d.ft, 328.084, places=3) + + def testAccessInvalid(self): + "Testing access in invalid units" +@@ -172,7 +172,7 @@ + "Testing access in different units" + a = A(sq_m=100) + self.assertEqual(a.sq_km, 0.0001) +- self.assertAlmostEqual(a.sq_ft, 1076.391, 3) ++ self.assertAlmostEqual(a.sq_ft, 1076.391, places=3) + + def testAccessInvaliA(self): + "Testing access in invalid units" diff --git a/dev-python/django/files/django-1.5.4-objects.patch b/dev-python/django/files/django-1.5.4-objects.patch new file mode 100644 index 000000000000..48e649081d34 --- /dev/null +++ b/dev-python/django/files/django-1.5.4-objects.patch @@ -0,0 +1,31 @@ +Remove un-needed objects.inv files from d'loading during doc build +diff -ur Django-1.5.1.orig/docs/conf.py Django-1.5.1/docs/conf.py +--- docs/conf.py 2013-03-29 04:10:14.000000000 +0800 ++++ docs/conf.py 2013-05-28 01:54:49.695008477 +0800 +@@ -91,12 +91,6 @@ + + # Links to Python's docs should reference the most recent version of the 2.x + # branch, which is located at this URL. +-intersphinx_mapping = { +- 'python': ('http://docs.python.org/2.7', None), +- 'sphinx': ('http://sphinx.pocoo.org/', None), +- 'six': ('http://pythonhosted.org/six/', None), +- 'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None), +-} + + # Python's docs don't change every week. + intersphinx_cache_limit = 90 # days +# Fix creation of html docs on python 3 +# https://github.com/django/django/commit/a5733fcd7be7adb8b236825beff4ccda19900f9e +diff -ur Django-1.5.1.orig/docs/_ext/djangodocs.py Django-1.5.1/docs/_ext/djangodocs.py +--- docs/_ext/djangodocs.py 2013-03-29 04:07:21.000000000 +0800 ++++ docs/_ext/djangodocs.py 2013-05-28 02:34:59.057009144 +0800 +@@ -204,7 +204,7 @@ + if t == "templatefilter" and l == "ref/templates/builtins"], + } + outfilename = os.path.join(self.outdir, "templatebuiltins.js") +- with open(outfilename, 'wb') as fp: ++ with open(outfilename, 'w') as fp: + fp.write('var django_template_builtins = ') + json.dump(templatebuiltins, fp) + fp.write(';\n') diff --git a/dev-python/django/files/django-1.6-objects.patch b/dev-python/django/files/django-1.6-objects.patch new file mode 100644 index 000000000000..597da6e6bb1c --- /dev/null +++ b/dev-python/django/files/django-1.6-objects.patch @@ -0,0 +1,18 @@ +#Remove un-needed objects.inv files from d'loading during doc build +diff -ur Django-1.6.1.orig/docs/conf.py Django-1.6.1/docs/conf.py +--- docs/conf.py 2013-12-12 14:37:59.000000000 -0500 ++++ docs/conf.py 2014-01-16 20:57:36.253670094 -0500 +@@ -109,12 +109,6 @@ + + # Links to Python's docs should reference the most recent version of the 2.x + # branch, which is located at this URL. +-intersphinx_mapping = { +- 'python': ('http://docs.python.org/2.7', None), +- 'sphinx': ('http://sphinx.pocoo.org/', None), +- 'six': ('http://pythonhosted.org/six/', None), +- 'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None), +-} + + # Python's docs don't change every week. + intersphinx_cache_limit = 90 # days + diff --git a/dev-python/django/files/django-1.6.10-bashcomp.patch b/dev-python/django/files/django-1.6.10-bashcomp.patch new file mode 100644 index 000000000000..7c6ceff076a4 --- /dev/null +++ b/dev-python/django/files/django-1.6.10-bashcomp.patch @@ -0,0 +1,35 @@ + extras/django_bash_completion | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +diff --git a/extras/django_bash_completion b/extras/django_bash_completion +index 8f85211..ab13755 100755 +--- a/extras/django_bash_completion ++++ b/extras/django_bash_completion +@@ -37,7 +37,7 @@ _django_completion() + COMP_CWORD=$COMP_CWORD \ + DJANGO_AUTO_COMPLETE=1 $1 ) ) + } +-complete -F _django_completion -o default django-admin.py manage.py django-admin ++complete -F _django_completion -o default django-admin.py django-admin + + _python_django_completion() + { +@@ -55,18 +55,3 @@ _python_django_completion() + fi + fi + } +- +-# Support for multiple interpreters. +-unset pythons +-if command -v whereis &>/dev/null; then +- python_interpreters=$(whereis python | cut -d " " -f 2-) +- for python in $python_interpreters; do +- pythons="${pythons} ${python##*/}" +- done +- pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ") +-else +- pythons=python +-fi +- +-complete -F _python_django_completion -o default $pythons +- diff --git a/dev-python/django/files/django-1.7.6-bashcomp.patch b/dev-python/django/files/django-1.7.6-bashcomp.patch new file mode 100644 index 000000000000..ef76f8a873c7 --- /dev/null +++ b/dev-python/django/files/django-1.7.6-bashcomp.patch @@ -0,0 +1,34 @@ + extras/django_bash_completion | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/extras/django_bash_completion b/extras/django_bash_completion +index 3e02d8e..5a33938 100755 +--- a/extras/django_bash_completion ++++ b/extras/django_bash_completion +@@ -37,7 +37,7 @@ _django_completion() + COMP_CWORD=$COMP_CWORD \ + DJANGO_AUTO_COMPLETE=1 $1 ) ) + } +-complete -F _django_completion -o default django-admin.py manage.py django-admin ++complete -F _django_completion -o default django-admin.py django-admin + + _python_django_completion() + { +@@ -55,17 +55,3 @@ _python_django_completion() + fi + fi + } +- +-# Support for multiple interpreters. +-unset pythons +-if command -v whereis &>/dev/null; then +- python_interpreters=$(whereis python | cut -d " " -f 2-) +- for python in $python_interpreters; do +- pythons="${pythons} ${python##*/}" +- done +- pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ") +-else +- pythons=python +-fi +- +-complete -F _python_django_completion -o default $pythons -- cgit v1.2.3-65-gdbad