commit: 541eafae3ebcbca12f34b196a5dc40576987af87
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 18:09:10 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 18:22:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541eafae
sci-libs/ViSP: Remove support for non-existent deps
sci-libs/ViSP/ViSP-3.0.1.ebuild | 12 +++++-------
sci-libs/ViSP/ViSP-3.1.0.ebuild | 12 +++++-------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/sci-libs/ViSP/ViSP-3.0.1.ebuild b/sci-libs/ViSP/ViSP-3.0.1.ebuild
index 390e20cb18a..35fbfb4321b 100644
--- a/sci-libs/ViSP/ViSP-3.0.1.ebuild
+++ b/sci-libs/ViSP/ViSP-3.0.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/3"
KEYWORDS="~amd64 ~arm"
IUSE="
+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif
ogre
- ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
+ ois opencv png test tutorials usb v4l X xml +zbar zlib
cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
"
@@ -26,11 +26,10 @@ RDEPEND="
ieee1394? ( media-libs/libdc1394 )
jpeg? ( virtual/jpeg:0 )
lapack? ( virtual/lapack )
- !qt4? ( motif? ( media-libs/SoXt ) )
+ motif? ( media-libs/SoXt )
ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
- opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) )
+ opencv? ( media-libs/opencv:= )
png? ( media-libs/libpng:0= )
- qt4? ( media-libs/SoQt dev-qt/qtgui:4 )
usb? ( virtual/libusb:1 )
v4l? ( media-libs/libv4l )
X? ( x11-libs/libX11 )
@@ -48,7 +47,6 @@ RDEPEND="${RDEPEND}
REQUIRED_USE="
ffmpeg? ( opencv )
ois? ( ogre )
- qt4? ( coin )
motif? ( coin )
"
@@ -73,8 +71,8 @@ src_configure() {
"-DUSE_OGRE=$(usex ogre ON OFF)"
"-DUSE_OIS=$(usex ois ON OFF)"
"-DUSE_OPENCV=$(usex opencv ON OFF)"
- "-DUSE_SOQT=$(usex qt4 ON OFF)"
- "-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)"
+ "-DUSE_SOQT=OFF"
+ "-DUSE_SOXT=$(usex motif ON OFF)"
"-DUSE_V4L2=$(usex v4l ON OFF)"
"-DUSE_X11=$(usex X ON OFF)"
"-DUSE_XML2=$(usex xml ON OFF)"
diff --git a/sci-libs/ViSP/ViSP-3.1.0.ebuild b/sci-libs/ViSP/ViSP-3.1.0.ebuild
index 07dfbbd9105..354edc0a62b 100644
--- a/sci-libs/ViSP/ViSP-3.1.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.1.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/3.1"
KEYWORDS="~amd64 ~arm"
IUSE="
+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
- ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
+ ois opencv png test tutorials usb v4l X xml +zbar zlib
cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
"
@@ -25,11 +25,10 @@ RDEPEND="
ieee1394? ( media-libs/libdc1394 )
jpeg? ( virtual/jpeg:0 )
lapack? ( virtual/lapack )
- !qt4? ( motif? ( media-libs/SoXt ) )
+ motif? ( media-libs/SoXt )
ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
- opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) )
+ opencv? ( media-libs/opencv:= )
png? ( media-libs/libpng:0= )
- qt4? ( media-libs/SoQt dev-qt/qtgui:4 )
usb? ( virtual/libusb:1 )
v4l? ( media-libs/libv4l )
X? ( x11-libs/libX11 )
@@ -46,7 +45,6 @@ RDEPEND="${RDEPEND}
demos? ( sci-misc/ViSP-images )"
REQUIRED_USE="
ois? ( ogre )
- qt4? ( coin )
motif? ( coin )
"
@@ -70,8 +68,8 @@ src_configure() {
"-DUSE_OGRE=$(usex ogre ON OFF)"
"-DUSE_OIS=$(usex ois ON OFF)"
"-DUSE_OPENCV=$(usex opencv ON OFF)"
- "-DUSE_SOQT=$(usex qt4 ON OFF)"
- "-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)"
+ "-DUSE_SOQT=OFF"
+ "-DUSE_SOXT=$(usex motif ON OFF)"
"-DUSE_V4L2=$(usex v4l ON OFF)"
"-DUSE_X11=$(usex X ON OFF)"
"-DUSE_XML2=$(usex xml ON OFF)"
