| 1 |
commit: 3b0b4c6efa56748cae3f7de69798c4c9adb628ec |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 18 14:23:35 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 18 14:49:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0b4c6e |
| 7 |
|
| 8 |
media-libs/opencv: don't allow =dev-cpp/eigen-3.3.8 |
| 9 |
|
| 10 |
dev-cpp/eigen-3.3.8 was broken upstream and -r1 |
| 11 |
introduces a backported fix. |
| 12 |
|
| 13 |
While 3.3.8 was removed from tree, it is possible |
| 14 |
that 3.3.8 is still installed and satisfies the |
| 15 |
dependency on a user's machine, in the case |
| 16 |
of the latter bug referenced here. |
| 17 |
|
| 18 |
Bug: https://bugs.gentoo.org/747949 |
| 19 |
Closes: https://bugs.gentoo.org/749804 |
| 20 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 22 |
|
| 23 |
media-libs/opencv/opencv-4.4.0-r1.ebuild | 8 +++++++- |
| 24 |
media-libs/opencv/opencv-4.5.0.ebuild | 8 +++++++- |
| 25 |
2 files changed, 14 insertions(+), 2 deletions(-) |
| 26 |
|
| 27 |
diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild |
| 28 |
index 259f25ce1f0..df2a210f927 100644 |
| 29 |
--- a/media-libs/opencv/opencv-4.4.0-r1.ebuild |
| 30 |
+++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild |
| 31 |
@@ -138,8 +138,14 @@ RDEPEND=" |
| 32 |
vtk? ( sci-libs/vtk[rendering] ) |
| 33 |
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) |
| 34 |
xine? ( media-libs/xine-lib )" |
| 35 |
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream) |
| 36 |
DEPEND="${RDEPEND} |
| 37 |
- eigen? ( dev-cpp/eigen:3 ) |
| 38 |
+ eigen? ( |
| 39 |
+ || ( |
| 40 |
+ >=dev-cpp/eigen-3.3.8-r1:3 |
| 41 |
+ <dev-cpp/eigen-3.3.8:3 |
| 42 |
+ ) |
| 43 |
+ ) |
| 44 |
java? ( >=virtual/jdk-1.6 )" |
| 45 |
BDEPEND="virtual/pkgconfig" |
| 46 |
|
| 47 |
|
| 48 |
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild |
| 49 |
index b449ad07ad6..54bb9292356 100644 |
| 50 |
--- a/media-libs/opencv/opencv-4.5.0.ebuild |
| 51 |
+++ b/media-libs/opencv/opencv-4.5.0.ebuild |
| 52 |
@@ -138,8 +138,14 @@ RDEPEND=" |
| 53 |
vtk? ( sci-libs/vtk[rendering] ) |
| 54 |
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) |
| 55 |
xine? ( media-libs/xine-lib )" |
| 56 |
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream) |
| 57 |
DEPEND="${RDEPEND} |
| 58 |
- eigen? ( dev-cpp/eigen:3 ) |
| 59 |
+ eigen? ( |
| 60 |
+ || ( |
| 61 |
+ >=dev-cpp/eigen-3.3.8-r1:3 |
| 62 |
+ <dev-cpp/eigen-3.3.8:3 |
| 63 |
+ ) |
| 64 |
+ ) |
| 65 |
java? ( >=virtual/jdk-1.6 )" |
| 66 |
BDEPEND="virtual/pkgconfig" |
Archives