Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-cpp/vexcl/files/, dev-cpp/vexcl/
Date: Thu, 12 May 2022 09:14:56
Message-Id: 1652268557.0d07becc67773ebc8ff9090fd8294b19ade1b378.andrewammerlaan@gentoo
1 commit: 0d07becc67773ebc8ff9090fd8294b19ade1b378
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Wed May 11 10:28:07 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Wed May 11 11:29:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0d07becc
7
8 dev-cpp/vexcl: remove patches
9
10 Closes: https://bugs.gentoo.org/843494
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12
13 .../files/add-sphinx-ext-autodoc-to-conf-py.patch | 11 ---------
14 dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch | 26 ----------------------
15 dev-cpp/vexcl/vexcl-1.4.3.ebuild | 8 +------
16 3 files changed, 1 insertion(+), 44 deletions(-)
17
18 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
19 deleted file mode 100644
20 index 405376cf9..000000000
21 --- a/dev-cpp/vexcl/files/add-sphinx-ext-autodoc-to-conf-py.patch
22 +++ /dev/null
23 @@ -1,11 +0,0 @@
24 ---- a/docs/conf.py
25 -+++ b/docs/conf.py
26 -@@ -45,7 +45,7 @@
27 - # Add any Sphinx extension module names here, as strings. They can be
28 - # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
29 - # ones.
30 --extensions = ['breathe', 'sphinx.ext.mathjax',
31 -+extensions = ['breathe', 'sphinx.ext.mathjax', 'sphinx.ext.autodoc',
32 - 'matplotlib.sphinxext.plot_directive']
33 -
34 - breathe_projects = {'VEXCL' : 'xml'}
35
36 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
37 deleted file mode 100644
38 index e3fd08a16..000000000
39 --- a/dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch
40 +++ /dev/null
41 @@ -1,26 +0,0 @@
42 -From 555a838850c96ab838a299255157fbe4fd4df2ee Mon Sep 17 00:00:00 2001
43 -From: Denis Demidov <dennis.demidov@×××××.com>
44 -Date: Mon, 4 Oct 2021 10:46:03 +0300
45 -Subject: [PATCH] Missing <map> include in backend/{opencl/compute}/filter.hpp
46 -
47 -Fixes #290
48 ---- a/vexcl/backend/compute/filter.hpp
49 -+++ b/vexcl/backend/compute/filter.hpp
50 -@@ -35,6 +35,7 @@ THE SOFTWARE.
51 - #include <fstream>
52 - #include <string>
53 - #include <vector>
54 -+#include <map>
55 - #include <functional>
56 - #include <cstdlib>
57 -
58 ---- a/vexcl/backend/opencl/filter.hpp
59 -+++ b/vexcl/backend/opencl/filter.hpp
60 -@@ -35,6 +35,7 @@ THE SOFTWARE.
61 - #include <fstream>
62 - #include <string>
63 - #include <vector>
64 -+#include <map>
65 - #include <functional>
66 - #include <cstdlib>
67 -
68
69 diff --git a/dev-cpp/vexcl/vexcl-1.4.3.ebuild b/dev-cpp/vexcl/vexcl-1.4.3.ebuild
70 index 4dd650c5d..eb5ca757a 100644
71 --- a/dev-cpp/vexcl/vexcl-1.4.3.ebuild
72 +++ b/dev-cpp/vexcl/vexcl-1.4.3.ebuild
73 @@ -35,13 +35,7 @@ RDEPEND="
74 "
75 DEPEND="${RDEPEND}"
76
77 -PATCHES=(
78 - "${FILESDIR}/add-sphinx-ext-autodoc-to-conf-py.patch"
79 - "${FILESDIR}/${P}-include-map.patch"
80 -)
81 -REQUIRED_USE="
82 - ^^ ( ${IUSE_BACKEND//+/} )
83 -"
84 +REQUIRED_USE="^^ ( ${IUSE_BACKEND//+/} )"
85 RESTRICT="!test? ( test )"
86
87 src_prepare() {