summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Brandt <alunduil@gentoo.org>2015-05-17 17:15:49 +0000
committerAlex Brandt <alunduil@gentoo.org>2015-05-17 17:15:49 +0000
commit8f9faff55f1265cf5e65d519b6e41e5ce9f1a83b (patch)
tree1ced0a0f453545ab3a1b6d8f6555fa682b574af7 /www-servers
parentResolve chromium build issues, bug 549328. (diff)
downloadgentoo-2-8f9faff55f1265cf5e65d519b6e41e5ce9f1a83b.tar.gz
gentoo-2-8f9faff55f1265cf5e65d519b6e41e5ce9f1a83b.tar.bz2
gentoo-2-8f9faff55f1265cf5e65d519b6e41e5ce9f1a83b.zip
version intersphinx patch file
This patch changes for tornado-4.2 and requires that the current file be accessible under a different name to keep moving forward. (Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 11A8217C!)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tornado/ChangeLog9
-rw-r--r--www-servers/tornado/files/4.1.0-drop-intersphinx.patch36
-rw-r--r--www-servers/tornado/tornado-4.1.0-r1.ebuild4
-rw-r--r--www-servers/tornado/tornado-4.1.0.ebuild4
4 files changed, 48 insertions, 5 deletions
diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog
index 442e947a103a..e580974bd21c 100644
--- a/www-servers/tornado/ChangeLog
+++ b/www-servers/tornado/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for www-servers/tornado
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.70 2015/05/17 10:17:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.71 2015/05/17 17:15:49 alunduil Exp $
+
+ 17 May 2015; Alex Brandt <alunduil@gentoo.org>
+ +files/4.1.0-drop-intersphinx.patch, tornado-4.1.0-r1.ebuild,
+ tornado-4.1.0.ebuild:
+ version intersphinx patch file This patch changes for tornado-4.2 and
+ requires that the current file be accessible under a different name to keep
+ moving forward.
17 May 2015; Pacho Ramos <pacho@gentoo.org> tornado-4.1.0-r1.ebuild:
ppc keyword, bug #548938
diff --git a/www-servers/tornado/files/4.1.0-drop-intersphinx.patch b/www-servers/tornado/files/4.1.0-drop-intersphinx.patch
new file mode 100644
index 000000000000..e7da6fbefea2
--- /dev/null
+++ b/www-servers/tornado/files/4.1.0-drop-intersphinx.patch
@@ -0,0 +1,36 @@
+diff --git a/docs/Makefile b/docs/Makefile
+index a491685..ba4888f 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -1,7 +1,7 @@
+ .PHONY: all
+ all: sphinx
+
+-SPHINXOPTS=-n -W -d build/doctrees .
++SPHINXOPTS=-n -d build/doctrees .
+
+ .PHONY: sphinx
+ sphinx:
+diff --git a/docs/conf.py b/docs/conf.py
+index d9b4761..4c11038 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -15,7 +15,6 @@ extensions = [
+ "sphinx.ext.autodoc",
+ "sphinx.ext.coverage",
+ "sphinx.ext.extlinks",
+- "sphinx.ext.intersphinx",
+ "sphinx.ext.viewcode",
+ ]
+
+@@ -94,10 +93,6 @@ extlinks = {
+ 'tornado-%s.tar.g' % version),
+ }
+
+-intersphinx_mapping = {
+- 'python': ('http://python.readthedocs.org/en/latest/', None),
+- }
+-
+ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+ # On RTD we can't import sphinx_rtd_theme, but it will be applied by
diff --git a/www-servers/tornado/tornado-4.1.0-r1.ebuild b/www-servers/tornado/tornado-4.1.0-r1.ebuild
index 8de35620899a..abeecdb5d6ba 100644
--- a/www-servers/tornado/tornado-4.1.0-r1.ebuild
+++ b/www-servers/tornado/tornado-4.1.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-4.1.0-r1.ebuild,v 1.4 2015/05/17 10:17:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-4.1.0-r1.ebuild,v 1.5 2015/05/17 17:15:49 alunduil Exp $
EAPI=5
@@ -41,7 +41,7 @@ RDEPEND="${CDEPEND}"
python_prepare_all() {
local PATCHES=(
- "${FILESDIR}"/drop-intersphinx.patch
+ "${FILESDIR}"/${PV}-drop-intersphinx.patch
)
distutils-r1_python_prepare_all
diff --git a/www-servers/tornado/tornado-4.1.0.ebuild b/www-servers/tornado/tornado-4.1.0.ebuild
index e6d2a53a1754..d8a9df51190a 100644
--- a/www-servers/tornado/tornado-4.1.0.ebuild
+++ b/www-servers/tornado/tornado-4.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-4.1.0.ebuild,v 1.3 2015/05/10 09:35:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-4.1.0.ebuild,v 1.4 2015/05/17 17:15:49 alunduil Exp $
EAPI=5
@@ -39,7 +39,7 @@ RDEPEND="${CDEPEND}"
python_prepare_all() {
local PATCHES=(
- "${FILESDIR}"/drop-intersphinx.patch
+ "${FILESDIR}"/${PV}-drop-intersphinx.patch
)
distutils-r1_python_prepare_all