beremiz ebuild minor change

bignaux · Feb 21, 2015 · 4b997c1 · 4b997c1
1 parent 479774c
commit 4b997c1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/dev-util/beremiz/beremiz-9999.ebuild b/dev-util/beremiz/beremiz-9999.ebuild
@@ -27,9 +27,9 @@ KEYWORDS=""
 IUSE="canfestival doc +twisted"
 
 RDEPEND="
-		canfestival? ( dev-libs/canfestival \
+		canfestival? ( dev-libs/canfestival
 		               dev-python/gnosis-utils )
-		twisted? ( dev-python/twisted-core \
+		twisted? ( dev-python/twisted-core
 		           dev-python/autobahn  )
 		dev-lang/matiec
         dev-python/wxpython:2.8
@@ -39,6 +39,12 @@ RDEPEND="
 		dev-python/simplejson
 		dev-util/wxglade"
 
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinx-better-theme
+	)"
+
 src_prepare() {
     epatch "${FILESDIR}/beremiz-fix-wxversion.patch"
 }
@@ -57,7 +63,11 @@ src_install() {
 	newicon "images/brz.png" "${PN}.png"
     make_desktop_entry /usr/bin/beremiz "Beremiz" "${PN}" "Development"
 
-	if use doc; then
-		dohtml -r doc/*
-	fi
+#	if use doc; then
+#		docinto doc
+#		dodoc doc/{index.rst,overview.rst,standards.rst}
+#		docinto manual
+#		dodoc doc/manual/{build.rst,debug.rst,edit.rst,index.rst,install.rst,start.rst}
+#		#dohtml -r doc/*
+#	fi
 }
diff --git a/dev-util/beremiz/files/beremiz-fix-wxversion.patch b/dev-util/beremiz/files/beremiz-fix-wxversion.patch
@@ -1,6 +1,14 @@
-diff -r 4c130dba8366 Beremiz.py
+# HG changeset patch
+# User Ronan Bignaux <r.bignaux@rbi.io>
+# Date 1424453230 -3600
+#      Fri Feb 20 18:27:10 2015 +0100
+# Node ID f40592adf09698bec0c0ba3afb9c5a2b34de9e68
+# Parent  4c130dba836607004aec431040e1ee0d11eb5957
+specify wxversion to avoid bug when wxpython 3 is installed
+
+diff -r 4c130dba8366 -r f40592adf096 Beremiz.py
 --- a/Beremiz.py	Mon Mar 17 16:16:06 2014 +0100
-+++ b/Beremiz.py	Thu Feb 19 15:01:21 2015 +0100
++++ b/Beremiz.py	Fri Feb 20 18:27:10 2015 +0100
 @@ -25,7 +25,10 @@
 
  updateinfo_url = None