[gentoo-commits] repo/proj/guru:master commit in: dev-cpp/vexcl/files/, dev-cpp/vexcl/

[gentoo-commits] repo/proj/guru:master commit in: dev-cpp/vexcl/files/, dev-cpp/vexcl/

[Andrew Ammerlaan]

commit:     0d07becc67773ebc8ff9090fd8294b19ade1b378
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed May 11 10:28:07 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed May 11 11:29:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0d07becc

dev-cpp/vexcl: remove patches

Closes: https://bugs.gentoo.org/843494
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 .../files/add-sphinx-ext-autodoc-to-conf-py.patch  | 11 ---------
 dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch  | 26 ----------------------
 dev-cpp/vexcl/vexcl-1.4.3.ebuild                   |  8 +------
 3 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/dev-cpp/vexcl/files/add-sphinx-ext-autodoc-to-conf-py.patch b/dev-cpp/vexcl/files/add-sphinx-ext-autodoc-to-conf-py.patch
deleted file mode 100644
index 405376cf9..000000000
--- a/dev-cpp/vexcl/files/add-sphinx-ext-autodoc-to-conf-py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -45,7 +45,7 @@
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
- # ones.
--extensions = ['breathe', 'sphinx.ext.mathjax',
-+extensions = ['breathe', 'sphinx.ext.mathjax', 'sphinx.ext.autodoc',
-         'matplotlib.sphinxext.plot_directive']
- 
- breathe_projects = {'VEXCL' : 'xml'}

diff --git a/dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch b/dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch
deleted file mode 100644
index e3fd08a16..000000000
--- a/dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 555a838850c96ab838a299255157fbe4fd4df2ee Mon Sep 17 00:00:00 2001
-From: Denis Demidov <dennis.demidov@gmail.com>
-Date: Mon, 4 Oct 2021 10:46:03 +0300
-Subject: [PATCH] Missing <map> include in backend/{opencl/compute}/filter.hpp
-
-Fixes #290
---- a/vexcl/backend/compute/filter.hpp
-+++ b/vexcl/backend/compute/filter.hpp
-@@ -35,6 +35,7 @@ THE SOFTWARE.
- #include <fstream>
- #include <string>
- #include <vector>
-+#include <map>
- #include <functional>
- #include <cstdlib>
- 
---- a/vexcl/backend/opencl/filter.hpp
-+++ b/vexcl/backend/opencl/filter.hpp
-@@ -35,6 +35,7 @@ THE SOFTWARE.
- #include <fstream>
- #include <string>
- #include <vector>
-+#include <map>
- #include <functional>
- #include <cstdlib>
- 

diff --git a/dev-cpp/vexcl/vexcl-1.4.3.ebuild b/dev-cpp/vexcl/vexcl-1.4.3.ebuild
index 4dd650c5d..eb5ca757a 100644
--- a/dev-cpp/vexcl/vexcl-1.4.3.ebuild
+++ b/dev-cpp/vexcl/vexcl-1.4.3.ebuild
@@ -35,13 +35,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/add-sphinx-ext-autodoc-to-conf-py.patch"
-	"${FILESDIR}/${P}-include-map.patch"
-)
-REQUIRED_USE="
-	^^ ( ${IUSE_BACKEND//+/} )
-"
+REQUIRED_USE="^^ ( ${IUSE_BACKEND//+/} )"
 RESTRICT="!test? ( test )"
 
 src_prepare() {

[gentoo-commits] repo/proj/guru:master commit in: dev-cpp/vexcl/files/, dev-cpp/vexcl/

[Andrew Ammerlaan]

commit:     d288205bf81177e99b2e867052db04c774f800dd
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu May 13 15:56:53 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu May 13 15:57:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d288205b

dev-cpp/vexcl: improve docs WIP

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-cpp/vexcl/files/add-sphinx-ext-autodoc-to-conf-py.patch | 11 +++++++++++
 dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild                         | 11 +++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dev-cpp/vexcl/files/add-sphinx-ext-autodoc-to-conf-py.patch b/dev-cpp/vexcl/files/add-sphinx-ext-autodoc-to-conf-py.patch
new file mode 100644
index 000000000..405376cf9
--- /dev/null
+++ b/dev-cpp/vexcl/files/add-sphinx-ext-autodoc-to-conf-py.patch
@@ -0,0 +1,11 @@
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -45,7 +45,7 @@
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['breathe', 'sphinx.ext.mathjax',
++extensions = ['breathe', 'sphinx.ext.mathjax', 'sphinx.ext.autodoc',
+         'matplotlib.sphinxext.plot_directive']
+ 
+ breathe_projects = {'VEXCL' : 'xml'}

diff --git a/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild b/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
index a2599bbb7..b3c196c69 100644
--- a/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
+++ b/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=7
 
-#DOCS_AUTODOC=0
 DOCS_BUILDER="sphinx"
-DOCS_DEPEND="dev-python/sphinx-bootstrap-theme"
+DOCS_DEPEND="
+	dev-python/breathe
+	dev-python/sphinx-bootstrap-theme
+"
 DOCS_DIR="docs"
 PYTHON_COMPAT=( python3_{7..9} )
 
@@ -29,9 +31,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/add-sphinx-ext-autodoc-to-conf-py.patch" )
+
 src_prepare() {
-	default
-	sed -e "s|git_version()|${PV}|g" -i docs/conf.py || die
+	sed -e "s|git_version()|\'${PV}\'|g" -i docs/conf.py || die
 	cmake_src_prepare
 }