dev-python/sphinx: <1.5.1 is incompatible with docutils 0.13

Closes: https://github.com/gentoo/gentoo/pull/3635

diff --git a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild b/dev-python/sphinx/sphinx-1.1.3-r8.ebuild
similarity index 96%
rename from dev-python/sphinx/sphinx-1.1.3-r7.ebuild
rename to dev-python/sphinx/sphinx-1.1.3-r8.ebuild
index 8a05112b33385e9ec9a769fd3f32873f4f437df3..ef08cf4fd8f44f3962d40eb50e267ffb9696a2ac 100644 (file)
--- a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbs
 IUSE="doc latex test"
 
 # Split the jinja dep to allow different slots to satisfy it
-RDEPEND=">=dev-python/docutils-0.7[${PYTHON_USEDEP}]
+RDEPEND="
+       <dev-python/docutils-0.13[${PYTHON_USEDEP}]
        >=dev-python/jinja-2.3[${PYTHON_USEDEP}]
        >=dev-python/pygments-1.2[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]

diff --git a/dev-python/sphinx/sphinx-1.2.2.ebuild b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
similarity index 97%
rename from dev-python/sphinx/sphinx-1.2.2.ebuild
rename to dev-python/sphinx/sphinx-1.2.2-r1.ebuild
index 259d5f8a23d24e4faea619144abfdc50b125c01d..a7043a6c45d5fb139e1d256e90e98d4da3fc94ca 100644 (file)
--- a/dev-python/sphinx/sphinx-1.2.2.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ IUSE="doc latex test"
 
 # Split the jinja dep to allow different slots to satisfy it
 RDEPEND="
-       >=dev-python/docutils-0.7[${PYTHON_USEDEP}]
+       <dev-python/docutils-0.13[${PYTHON_USEDEP}]
        >=dev-python/jinja-2.3[${PYTHON_USEDEP}]
        >=dev-python/pygments-1.2[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]

diff --git a/dev-python/sphinx/sphinx-1.2.3.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
similarity index 97%
rename from dev-python/sphinx/sphinx-1.2.3.ebuild
rename to dev-python/sphinx/sphinx-1.2.3-r1.ebuild
index ddf3abdace2854cb0cea09fc61ca8a060a57ebf7..3768f092832f0ada2b240a425d958491cdad4665 100644 (file)
--- a/dev-python/sphinx/sphinx-1.2.3.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ IUSE="doc latex test"
 # Portage has only >= minimum required versions of all rdeps making
 # setting of version borders unnecessary
 RDEPEND="
-       dev-python/docutils[${PYTHON_USEDEP}]
+       <dev-python/docutils-0.13[${PYTHON_USEDEP}]
        dev-python/jinja[${PYTHON_USEDEP}]
        dev-python/pygments[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]

diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
similarity index 97%
rename from dev-python/sphinx/sphinx-1.3.1-r1.ebuild
rename to dev-python/sphinx/sphinx-1.3.1-r2.ebuild
index 103c5ca89111fbfc95abce3664547ebe3ff56088..746cdf20c0825909af0a906d3d5078fabd44a09a 100644 (file)
--- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,7 @@ IUSE="doc latex test"
 RDEPEND="
        =dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
        >=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+       <dev-python/docutils-0.13[${PYTHON_USEDEP}]
        >=dev-python/jinja-2.3[${PYTHON_USEDEP}]
        >=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
        >=dev-python/six-1.4[${PYTHON_USEDEP}]

diff --git a/dev-python/sphinx/sphinx-1.3.5.ebuild b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
similarity index 97%
rename from dev-python/sphinx/sphinx-1.3.5.ebuild
rename to dev-python/sphinx/sphinx-1.3.5-r1.ebuild
index fd88c7f3ae6a3741a77969c797b1b7b2581d6b7e..31970748c5bac1eca1128580e57244d4d8b94ec9 100644 (file)
--- a/dev-python/sphinx/sphinx-1.3.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,7 @@ IUSE="doc latex test"
 RDEPEND="
        =dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
        >=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+       <dev-python/docutils-0.13[${PYTHON_USEDEP}]
        >=dev-python/jinja-2.3[${PYTHON_USEDEP}]
        >=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
        >=dev-python/six-1.4[${PYTHON_USEDEP}]