| 1 |
commit: 541eafae3ebcbca12f34b196a5dc40576987af87 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 26 18:09:10 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 26 18:22:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541eafae |
| 7 |
|
| 8 |
sci-libs/ViSP: Remove support for non-existent deps |
| 9 |
|
| 10 |
sci-libs/ViSP/ViSP-3.0.1.ebuild | 12 +++++------- |
| 11 |
sci-libs/ViSP/ViSP-3.1.0.ebuild | 12 +++++------- |
| 12 |
2 files changed, 10 insertions(+), 14 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sci-libs/ViSP/ViSP-3.0.1.ebuild b/sci-libs/ViSP/ViSP-3.0.1.ebuild |
| 15 |
index 390e20cb18a..35fbfb4321b 100644 |
| 16 |
--- a/sci-libs/ViSP/ViSP-3.0.1.ebuild |
| 17 |
+++ b/sci-libs/ViSP/ViSP-3.0.1.ebuild |
| 18 |
@@ -14,7 +14,7 @@ SLOT="0/3" |
| 19 |
KEYWORDS="~amd64 ~arm" |
| 20 |
IUSE=" |
| 21 |
+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre |
| 22 |
- ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib |
| 23 |
+ ois opencv png test tutorials usb v4l X xml +zbar zlib |
| 24 |
cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 |
| 25 |
" |
| 26 |
|
| 27 |
@@ -26,11 +26,10 @@ RDEPEND=" |
| 28 |
ieee1394? ( media-libs/libdc1394 ) |
| 29 |
jpeg? ( virtual/jpeg:0 ) |
| 30 |
lapack? ( virtual/lapack ) |
| 31 |
- !qt4? ( motif? ( media-libs/SoXt ) ) |
| 32 |
+ motif? ( media-libs/SoXt ) |
| 33 |
ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) |
| 34 |
- opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) ) |
| 35 |
+ opencv? ( media-libs/opencv:= ) |
| 36 |
png? ( media-libs/libpng:0= ) |
| 37 |
- qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) |
| 38 |
usb? ( virtual/libusb:1 ) |
| 39 |
v4l? ( media-libs/libv4l ) |
| 40 |
X? ( x11-libs/libX11 ) |
| 41 |
@@ -48,7 +47,6 @@ RDEPEND="${RDEPEND} |
| 42 |
REQUIRED_USE=" |
| 43 |
ffmpeg? ( opencv ) |
| 44 |
ois? ( ogre ) |
| 45 |
- qt4? ( coin ) |
| 46 |
motif? ( coin ) |
| 47 |
" |
| 48 |
|
| 49 |
@@ -73,8 +71,8 @@ src_configure() { |
| 50 |
"-DUSE_OGRE=$(usex ogre ON OFF)" |
| 51 |
"-DUSE_OIS=$(usex ois ON OFF)" |
| 52 |
"-DUSE_OPENCV=$(usex opencv ON OFF)" |
| 53 |
- "-DUSE_SOQT=$(usex qt4 ON OFF)" |
| 54 |
- "-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)" |
| 55 |
+ "-DUSE_SOQT=OFF" |
| 56 |
+ "-DUSE_SOXT=$(usex motif ON OFF)" |
| 57 |
"-DUSE_V4L2=$(usex v4l ON OFF)" |
| 58 |
"-DUSE_X11=$(usex X ON OFF)" |
| 59 |
"-DUSE_XML2=$(usex xml ON OFF)" |
| 60 |
|
| 61 |
diff --git a/sci-libs/ViSP/ViSP-3.1.0.ebuild b/sci-libs/ViSP/ViSP-3.1.0.ebuild |
| 62 |
index 07dfbbd9105..354edc0a62b 100644 |
| 63 |
--- a/sci-libs/ViSP/ViSP-3.1.0.ebuild |
| 64 |
+++ b/sci-libs/ViSP/ViSP-3.1.0.ebuild |
| 65 |
@@ -14,7 +14,7 @@ SLOT="0/3.1" |
| 66 |
KEYWORDS="~amd64 ~arm" |
| 67 |
IUSE=" |
| 68 |
+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre |
| 69 |
- ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib |
| 70 |
+ ois opencv png test tutorials usb v4l X xml +zbar zlib |
| 71 |
cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 |
| 72 |
" |
| 73 |
|
| 74 |
@@ -25,11 +25,10 @@ RDEPEND=" |
| 75 |
ieee1394? ( media-libs/libdc1394 ) |
| 76 |
jpeg? ( virtual/jpeg:0 ) |
| 77 |
lapack? ( virtual/lapack ) |
| 78 |
- !qt4? ( motif? ( media-libs/SoXt ) ) |
| 79 |
+ motif? ( media-libs/SoXt ) |
| 80 |
ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) |
| 81 |
- opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) ) |
| 82 |
+ opencv? ( media-libs/opencv:= ) |
| 83 |
png? ( media-libs/libpng:0= ) |
| 84 |
- qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) |
| 85 |
usb? ( virtual/libusb:1 ) |
| 86 |
v4l? ( media-libs/libv4l ) |
| 87 |
X? ( x11-libs/libX11 ) |
| 88 |
@@ -46,7 +45,6 @@ RDEPEND="${RDEPEND} |
| 89 |
demos? ( sci-misc/ViSP-images )" |
| 90 |
REQUIRED_USE=" |
| 91 |
ois? ( ogre ) |
| 92 |
- qt4? ( coin ) |
| 93 |
motif? ( coin ) |
| 94 |
" |
| 95 |
|
| 96 |
@@ -70,8 +68,8 @@ src_configure() { |
| 97 |
"-DUSE_OGRE=$(usex ogre ON OFF)" |
| 98 |
"-DUSE_OIS=$(usex ois ON OFF)" |
| 99 |
"-DUSE_OPENCV=$(usex opencv ON OFF)" |
| 100 |
- "-DUSE_SOQT=$(usex qt4 ON OFF)" |
| 101 |
- "-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)" |
| 102 |
+ "-DUSE_SOQT=OFF" |
| 103 |
+ "-DUSE_SOXT=$(usex motif ON OFF)" |
| 104 |
"-DUSE_V4L2=$(usex v4l ON OFF)" |
| 105 |
"-DUSE_X11=$(usex X ON OFF)" |
| 106 |
"-DUSE_XML2=$(usex xml ON OFF)" |
Archives