From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/ViSP/
Date: Sun, 26 Aug 2018 18:22:24 +0000 (UTC) [thread overview]
Message-ID: <1535307734.541eafae3ebcbca12f34b196a5dc40576987af87.mgorny@gentoo> (raw)
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)"
next reply other threads:[~2018-08-26 18:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-26 18:22 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-09 18:29 [gentoo-commits] repo/gentoo:master commit in: sci-libs/ViSP/ Eli Schwartz
2023-02-07 17:51 Andreas Sturmlechner
2022-09-04 12:23 David Seifert
2022-07-07 10:27 Alexis Ballier
2021-06-18 19:18 David Seifert
2020-08-31 9:10 Alexis Ballier
2020-06-25 12:12 Andreas Sturmlechner
2020-06-25 12:12 Andreas Sturmlechner
2020-06-25 12:12 Andreas Sturmlechner
2020-05-25 12:52 Alexis Ballier
2020-05-15 16:34 Alexis Ballier
2019-12-12 14:58 Michał Górny
2019-12-10 17:35 Alexis Ballier
2019-09-01 23:14 Thomas Deutschmann
2019-08-29 15:50 Alexis Ballier
2019-08-29 15:50 Alexis Ballier
2018-09-21 19:50 Andreas Sturmlechner
2018-09-21 19:50 Andreas Sturmlechner
2018-01-13 12:16 Alexis Ballier
2017-04-17 9:26 Alexis Ballier
2015-09-16 17:04 Alexis Ballier
2015-08-24 15:57 Alexis Ballier
2015-08-24 15:57 Alexis Ballier
2015-08-24 13:52 Alexis Ballier
2015-08-24 10:48 Alexis Ballier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1535307734.541eafae3ebcbca12f34b196a5dc40576987af87.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox