diff options
| -rw-r--r-- | eclass/kde5.eclass | 12 | ||||
| -rw-r--r-- | media-video/vlc/vlc-3.0.3-r1.ebuild | 2 | ||||
| -rw-r--r-- | media-video/vlc/vlc-3.0.9999.ebuild | 2 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 2 | ||||
| -rw-r--r-- | profiles/base/package.use.stable.mask | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index b1a8b064b9bb..47988cc5d427 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -506,12 +506,12 @@ kde5_src_prepare() { cmake-utils_src_prepare # only build examples when required - if ! use_if_iuse examples || ! use examples ; then + if ! (in_iuse examples && use examples) ; then cmake_comment_add_subdirectory examples fi # only enable handbook when required - if ! use_if_iuse handbook ; then + if in_iuse handbook && ! use handbook ; then cmake_comment_add_subdirectory ${KDE_DOC_DIR} if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then @@ -571,7 +571,7 @@ kde5_src_prepare() { fi # only build unit tests when required - if ! use_if_iuse test ; then + if ! (in_iuse test && use test) ; then if [[ ${KDE_TEST} = forceoptional ]] ; then punt_bogus_dep Qt5 Test # if forceoptional, also cover non-kde categories @@ -615,7 +615,7 @@ kde5_src_configure() { debug-print-function ${FUNCNAME} "$@" # we rely on cmake-utils.eclass to append -DNDEBUG too - if ! use_if_iuse debug; then + if in_iuse debug && ! use debug; then append-cppflags -DQT_NO_DEBUG fi @@ -629,11 +629,11 @@ kde5_src_configure() { fi fi - if ! use_if_iuse handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then + if in_iuse handbook && ! use handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON ) fi - if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then + if in_iuse designer && ! use designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) fi diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild index 23f9b8241fc5..402451ac9fbf 100644 --- a/media-video/vlc/vlc-3.0.3-r1.ebuild +++ b/media-video/vlc/vlc-3.0.3-r1.ebuild @@ -89,7 +89,7 @@ RDEPEND=" fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) - libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) + libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index eb219aabf349..4952663cc4be 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -89,7 +89,7 @@ RDEPEND=" fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) - libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) + libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index db33c8ab2ce2..59118d7bf74a 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -89,7 +89,7 @@ RDEPEND=" fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) - libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) + libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 884fbc406423..56babc9b2196 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -14,7 +14,9 @@ net-analyzer/wireshark doc # Andreas Sturmlechner <asturm@gentoo.org> (29 May 2018) # Depends on unstable media-libs/libaom, net-libs/srt +# >=media-video/libav-12 not stable yet, bug #617508 media-video/vlc aom srt +>=media-video/vlc-3.0.3-r1 libav # Andreas Sturmlechner <asturm@gentoo.org> (21 May 2018) # Depends on lots of unstable dependencies |