commit: f5244f42f274e1e5e165bf1ff2964ad1a31aa4d8 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 10 18:38:13 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 10 18:57:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5244f42
media-video/avidemux: Fix blockers Closes: https://bugs.gentoo.org/644126 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-libs/avidemux-core/avidemux-core-2.7.0.ebuild | 3 ++- media-libs/avidemux-core/avidemux-core-9999.ebuild | 3 ++- media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild | 2 +- media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild | 2 +- media-video/avidemux/avidemux-2.7.0.ebuild | 1 + media-video/avidemux/avidemux-9999.ebuild | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild index 92f9f8ec068..d1169d3d75c 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild @@ -34,7 +34,8 @@ COMMON_DEPEND=" xv? ( x11-libs/libXv:0 ) " RDEPEND="${COMMON_DEPEND} - !<media-video/avidemux-${PV}:${SLOT} + !<media-libs/avidemux-core-${PV} + !<media-video/avidemux-${PV} nls? ( virtual/libintl:0 ) " DEPEND="${COMMON_DEPEND} diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild index 92f9f8ec068..d1169d3d75c 100644 --- a/media-libs/avidemux-core/avidemux-core-9999.ebuild +++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild @@ -34,7 +34,8 @@ COMMON_DEPEND=" xv? ( x11-libs/libXv:0 ) " RDEPEND="${COMMON_DEPEND} - !<media-video/avidemux-${PV}:${SLOT} + !<media-libs/avidemux-core-${PV} + !<media-video/avidemux-${PV} nls? ( virtual/libintl:0 ) " DEPEND="${COMMON_DEPEND} diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild index fb70ffe36c2..2556ab1d6c6 100644 --- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild +++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild @@ -78,7 +78,7 @@ DEPEND="${COMMON_DEPEND} oss? ( virtual/os-headers:0 ) " RDEPEND="${COMMON_DEPEND} - !<media-libs/avidemux-plugins-${PV}:${SLOT} + !<media-libs/avidemux-plugins-${PV} " S="${WORKDIR}/${MY_P}" diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild index fb70ffe36c2..2556ab1d6c6 100644 --- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild +++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild @@ -78,7 +78,7 @@ DEPEND="${COMMON_DEPEND} oss? ( virtual/os-headers:0 ) " RDEPEND="${COMMON_DEPEND} - !<media-libs/avidemux-plugins-${PV}:${SLOT} + !<media-libs/avidemux-plugins-${PV} " S="${WORKDIR}/${MY_P}" diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild index d1ae46fc076..3408af19d4a 100644 --- a/media-video/avidemux/avidemux-2.7.0.ebuild +++ b/media-video/avidemux/avidemux-2.7.0.ebuild @@ -39,6 +39,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} nls? ( virtual/libintl:0 ) + !<media-video/avidemux-${PV} " PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild index d1ae46fc076..3408af19d4a 100644 --- a/media-video/avidemux/avidemux-9999.ebuild +++ b/media-video/avidemux/avidemux-9999.ebuild @@ -39,6 +39,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} nls? ( virtual/libintl:0 ) + !<media-video/avidemux-${PV} " PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
