diff options
| author |   Sam James <sam@gentoo.org> | 2020-10-18 14:23:35 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2020-10-18 14:49:28 +0000 |
| commit | 3b0b4c6efa56748cae3f7de69798c4c9adb628ec (patch) | |
| tree | 839191d9d76ba58511948ce01294a818d195e918 | |
| parent | dev-qt/qtxmlpatterns: x86 stable (bug #734600) (diff) | |
| download | gentoo-3b0b4c6efa56748cae3f7de69798c4c9adb628ec.tar.gz gentoo-3b0b4c6efa56748cae3f7de69798c4c9adb628ec.tar.bz2 gentoo-3b0b4c6efa56748cae3f7de69798c4c9adb628ec.zip | |
media-libs/opencv: don't allow =dev-cpp/eigen-3.3.8
dev-cpp/eigen-3.3.8 was broken upstream and -r1
introduces a backported fix.
While 3.3.8 was removed from tree, it is possible
that 3.3.8 is still installed and satisfies the
dependency on a user's machine, in the case
of the latter bug referenced here.
Bug: https://bugs.gentoo.org/747949
Closes: https://bugs.gentoo.org/749804
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | media-libs/opencv/opencv-4.4.0-r1.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-4.5.0.ebuild | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild index 259f25ce1f01..df2a210f927d 100644 --- a/media-libs/opencv/opencv-4.4.0-r1.ebuild +++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild @@ -138,8 +138,14 @@ RDEPEND=" vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) xine? ( media-libs/xine-lib )" +# bug #747949 for eigen (eigen-3.3.8 was broken upstream) DEPEND="${RDEPEND} - eigen? ( dev-cpp/eigen:3 ) + eigen? ( + || ( + >=dev-cpp/eigen-3.3.8-r1:3 + <dev-cpp/eigen-3.3.8:3 + ) + ) java? ( >=virtual/jdk-1.6 )" BDEPEND="virtual/pkgconfig" diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild index b449ad07ad6c..54bb9292356d 100644 --- a/media-libs/opencv/opencv-4.5.0.ebuild +++ b/media-libs/opencv/opencv-4.5.0.ebuild @@ -138,8 +138,14 @@ RDEPEND=" vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) xine? ( media-libs/xine-lib )" +# bug #747949 for eigen (eigen-3.3.8 was broken upstream) DEPEND="${RDEPEND} - eigen? ( dev-cpp/eigen:3 ) + eigen? ( + || ( + >=dev-cpp/eigen-3.3.8-r1:3 + <dev-cpp/eigen-3.3.8:3 + ) + ) java? ( >=virtual/jdk-1.6 )" BDEPEND="virtual/pkgconfig" |