1 |
commit: ddc871a2c76efe6f1243184ba31f71e1db2cc217 |
2 |
Author: Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net> |
3 |
AuthorDate: Tue Jan 24 19:50:08 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 26 22:39:43 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc871a2 |
7 |
|
8 |
dev-python/sphinx: <1.5.1 is incompatible with docutils 0.13 |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3635 |
11 |
|
12 |
dev-python/sphinx/{sphinx-1.1.3-r7.ebuild => sphinx-1.1.3-r8.ebuild} | 5 +++-- |
13 |
dev-python/sphinx/{sphinx-1.2.2.ebuild => sphinx-1.2.2-r1.ebuild} | 4 ++-- |
14 |
dev-python/sphinx/{sphinx-1.2.3.ebuild => sphinx-1.2.3-r1.ebuild} | 4 ++-- |
15 |
dev-python/sphinx/{sphinx-1.3.1-r1.ebuild => sphinx-1.3.1-r2.ebuild} | 3 ++- |
16 |
dev-python/sphinx/{sphinx-1.3.5.ebuild => sphinx-1.3.5-r1.ebuild} | 3 ++- |
17 |
5 files changed, 11 insertions(+), 8 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild b/dev-python/sphinx/sphinx-1.1.3-r8.ebuild |
20 |
similarity index 96% |
21 |
rename from dev-python/sphinx/sphinx-1.1.3-r7.ebuild |
22 |
rename to dev-python/sphinx/sphinx-1.1.3-r8.ebuild |
23 |
index 8a05112..ef08cf4 100644 |
24 |
--- a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild |
25 |
+++ b/dev-python/sphinx/sphinx-1.1.3-r8.ebuild |
26 |
@@ -1,4 +1,4 @@ |
27 |
-# Copyright 1999-2015 Gentoo Foundation |
28 |
+# Copyright 1999-2017 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
# $Id$ |
31 |
|
32 |
@@ -22,7 +22,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbs |
33 |
IUSE="doc latex test" |
34 |
|
35 |
# Split the jinja dep to allow different slots to satisfy it |
36 |
-RDEPEND=">=dev-python/docutils-0.7[${PYTHON_USEDEP}] |
37 |
+RDEPEND=" |
38 |
+ <dev-python/docutils-0.13[${PYTHON_USEDEP}] |
39 |
>=dev-python/jinja-2.3[${PYTHON_USEDEP}] |
40 |
>=dev-python/pygments-1.2[${PYTHON_USEDEP}] |
41 |
dev-python/setuptools[${PYTHON_USEDEP}] |
42 |
|
43 |
diff --git a/dev-python/sphinx/sphinx-1.2.2.ebuild b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild |
44 |
similarity index 97% |
45 |
rename from dev-python/sphinx/sphinx-1.2.2.ebuild |
46 |
rename to dev-python/sphinx/sphinx-1.2.2-r1.ebuild |
47 |
index 259d5f8..a7043a6 100644 |
48 |
--- a/dev-python/sphinx/sphinx-1.2.2.ebuild |
49 |
+++ b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild |
50 |
@@ -1,4 +1,4 @@ |
51 |
-# Copyright 1999-2015 Gentoo Foundation |
52 |
+# Copyright 1999-2017 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Id$ |
55 |
|
56 |
@@ -23,7 +23,7 @@ IUSE="doc latex test" |
57 |
|
58 |
# Split the jinja dep to allow different slots to satisfy it |
59 |
RDEPEND=" |
60 |
- >=dev-python/docutils-0.7[${PYTHON_USEDEP}] |
61 |
+ <dev-python/docutils-0.13[${PYTHON_USEDEP}] |
62 |
>=dev-python/jinja-2.3[${PYTHON_USEDEP}] |
63 |
>=dev-python/pygments-1.2[${PYTHON_USEDEP}] |
64 |
dev-python/setuptools[${PYTHON_USEDEP}] |
65 |
|
66 |
diff --git a/dev-python/sphinx/sphinx-1.2.3.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild |
67 |
similarity index 97% |
68 |
rename from dev-python/sphinx/sphinx-1.2.3.ebuild |
69 |
rename to dev-python/sphinx/sphinx-1.2.3-r1.ebuild |
70 |
index ddf3abd..3768f09 100644 |
71 |
--- a/dev-python/sphinx/sphinx-1.2.3.ebuild |
72 |
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild |
73 |
@@ -1,4 +1,4 @@ |
74 |
-# Copyright 1999-2015 Gentoo Foundation |
75 |
+# Copyright 1999-2017 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
# $Id$ |
78 |
|
79 |
@@ -24,7 +24,7 @@ IUSE="doc latex test" |
80 |
# Portage has only >= minimum required versions of all rdeps making |
81 |
# setting of version borders unnecessary |
82 |
RDEPEND=" |
83 |
- dev-python/docutils[${PYTHON_USEDEP}] |
84 |
+ <dev-python/docutils-0.13[${PYTHON_USEDEP}] |
85 |
dev-python/jinja[${PYTHON_USEDEP}] |
86 |
dev-python/pygments[${PYTHON_USEDEP}] |
87 |
dev-python/setuptools[${PYTHON_USEDEP}] |
88 |
|
89 |
diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild |
90 |
similarity index 97% |
91 |
rename from dev-python/sphinx/sphinx-1.3.1-r1.ebuild |
92 |
rename to dev-python/sphinx/sphinx-1.3.1-r2.ebuild |
93 |
index 103c5ca..746cdf2 100644 |
94 |
--- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild |
95 |
+++ b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild |
96 |
@@ -1,4 +1,4 @@ |
97 |
-# Copyright 1999-2015 Gentoo Foundation |
98 |
+# Copyright 1999-2017 Gentoo Foundation |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
# $Id$ |
101 |
|
102 |
@@ -24,6 +24,7 @@ IUSE="doc latex test" |
103 |
RDEPEND=" |
104 |
=dev-python/alabaster-0.7*[${PYTHON_USEDEP}] |
105 |
>=dev-python/docutils-0.11[${PYTHON_USEDEP}] |
106 |
+ <dev-python/docutils-0.13[${PYTHON_USEDEP}] |
107 |
>=dev-python/jinja-2.3[${PYTHON_USEDEP}] |
108 |
>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}] |
109 |
>=dev-python/six-1.4[${PYTHON_USEDEP}] |
110 |
|
111 |
diff --git a/dev-python/sphinx/sphinx-1.3.5.ebuild b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild |
112 |
similarity index 97% |
113 |
rename from dev-python/sphinx/sphinx-1.3.5.ebuild |
114 |
rename to dev-python/sphinx/sphinx-1.3.5-r1.ebuild |
115 |
index fd88c7f..3197074 100644 |
116 |
--- a/dev-python/sphinx/sphinx-1.3.5.ebuild |
117 |
+++ b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild |
118 |
@@ -1,4 +1,4 @@ |
119 |
-# Copyright 1999-2016 Gentoo Foundation |
120 |
+# Copyright 1999-2017 Gentoo Foundation |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
# $Id$ |
123 |
|
124 |
@@ -24,6 +24,7 @@ IUSE="doc latex test" |
125 |
RDEPEND=" |
126 |
=dev-python/alabaster-0.7*[${PYTHON_USEDEP}] |
127 |
>=dev-python/docutils-0.11[${PYTHON_USEDEP}] |
128 |
+ <dev-python/docutils-0.13[${PYTHON_USEDEP}] |
129 |
>=dev-python/jinja-2.3[${PYTHON_USEDEP}] |
130 |
>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}] |
131 |
>=dev-python/six-1.4[${PYTHON_USEDEP}] |