From 51350944b28b74246b75e212baa52972754fbc01 Mon Sep 17 00:00:00 2001
From: Patrick McLean <chutzpah@gentoo.org>
Date: Tue, 5 Apr 2016 11:42:10 -0700
Subject: [PATCH] app-emulation/ganeti: Always pull in sphinx in 2.13 and 2.14

Gentoo-Bug: 548972

Package-Manager: portage-2.2.28
---
 ...13.0-r2.ebuild => ganeti-2.13.0-r3.ebuild} | 19 ++++++++-----------
 ...14.1-r1.ebuild => ganeti-2.14.1-r2.ebuild} | 16 +++++++---------
 2 files changed, 15 insertions(+), 20 deletions(-)
 rename app-emulation/ganeti/{ganeti-2.13.0-r2.ebuild => ganeti-2.13.0-r3.ebuild} (96%)
 rename app-emulation/ganeti/{ganeti-2.14.1-r1.ebuild => ganeti-2.14.1-r2.ebuild} (96%)

diff --git a/app-emulation/ganeti/ganeti-2.13.0-r2.ebuild b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
similarity index 96%
rename from app-emulation/ganeti/ganeti-2.13.0-r2.ebuild
rename to app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
index 42b24edac28e..0eeaec98b564 100644
--- a/app-emulation/ganeti/ganeti-2.13.0-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,12 +17,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
 	inherit git-2
 	KEYWORDS=""
-	GIT_DEPEND="app-text/pandoc
-		dev-python/docutils
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-libs/gd[fontconfig,jpeg,png,truetype]
-		media-gfx/graphviz
-		media-fonts/urw-fonts"
 else
 	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -90,12 +84,15 @@ DEPEND="
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	haskell-daemons? ( dev-haskell/text:0= )
-	${PYTHON_DEPS}
-	${GIT_DEPEND}"
+	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
-	app-text/pandoc
+DEPEND+="
+	sys-devel/m4
+	<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	media-fonts/urw-fonts
+	media-gfx/graphviz
+	=app-text/pandoc-1.12*
 	test? (
 		dev-python/mock
 		dev-python/pyyaml
diff --git a/app-emulation/ganeti/ganeti-2.14.1-r1.ebuild b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
similarity index 96%
rename from app-emulation/ganeti/ganeti-2.14.1-r1.ebuild
rename to app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
index 17bb19c37c17..0e62c0adf9cc 100644
--- a/app-emulation/ganeti/ganeti-2.14.1-r1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,11 +17,6 @@ if [[ ${PV} =~ [9]{4,} ]] ; then
 	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
 	inherit git-2
 	KEYWORDS=""
-	GIT_DEPEND="dev-python/docutils
-		=dev-python/sphinx-1.2*[${PYTHON_USEDEP}]
-		media-libs/gd[fontconfig,jpeg,png,truetype]
-		media-gfx/graphviz
-		media-fonts/urw-fonts"
 else
 	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -118,11 +113,14 @@ DEPEND="
 	drbd? ( <sys-cluster/drbd-8.5 )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
-	${PYTHON_DEPS}
-	${GIT_DEPEND}"
+	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
+DEPEND+="
+	sys-devel/m4
+	<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	media-fonts/urw-fonts
+	media-gfx/graphviz
 	=app-text/pandoc-1.12*
 	>=dev-haskell/test-framework-0.6:0=
 	<dev-haskell/test-framework-0.9:0=
-- 
2.26.2