From ddc871a2c76efe6f1243184ba31f71e1db2cc217 Mon Sep 17 00:00:00 2001
From: Martin von Gagern <Martin.vGagern@gmx.net>
Date: Tue, 24 Jan 2017 20:50:08 +0100
Subject: [PATCH] dev-python/sphinx: <1.5.1 is incompatible with docutils 0.13

Closes: https://github.com/gentoo/gentoo/pull/3635
---
 .../{sphinx-1.1.3-r7.ebuild => sphinx-1.1.3-r8.ebuild}       | 5 +++--
 .../sphinx/{sphinx-1.2.2.ebuild => sphinx-1.2.2-r1.ebuild}   | 4 ++--
 .../sphinx/{sphinx-1.2.3.ebuild => sphinx-1.2.3-r1.ebuild}   | 4 ++--
 .../{sphinx-1.3.1-r1.ebuild => sphinx-1.3.1-r2.ebuild}       | 3 ++-
 .../sphinx/{sphinx-1.3.5.ebuild => sphinx-1.3.5-r1.ebuild}   | 3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)
 rename dev-python/sphinx/{sphinx-1.1.3-r7.ebuild => sphinx-1.1.3-r8.ebuild} (96%)
 rename dev-python/sphinx/{sphinx-1.2.2.ebuild => sphinx-1.2.2-r1.ebuild} (97%)
 rename dev-python/sphinx/{sphinx-1.2.3.ebuild => sphinx-1.2.3-r1.ebuild} (97%)
 rename dev-python/sphinx/{sphinx-1.3.1-r1.ebuild => sphinx-1.3.1-r2.ebuild} (97%)
 rename dev-python/sphinx/{sphinx-1.3.5.ebuild => sphinx-1.3.5-r1.ebuild} (97%)

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 8a05112b33385..ef08cf4fd8f44 100644
--- 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 259d5f8a23d24..a7043a6c45d5f 100644
--- 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 ddf3abdace285..3768f092832f0 100644
--- 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 103c5ca89111f..746cdf20c0825 100644
--- 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 fd88c7f3ae6a3..31970748c5bac 100644
--- 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}]