| 1 |
commit: f5244f42f274e1e5e165bf1ff2964ad1a31aa4d8 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 10 18:38:13 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 10 18:57:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5244f42 |
| 7 |
|
| 8 |
media-video/avidemux: Fix blockers |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/644126 |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
|
| 13 |
media-libs/avidemux-core/avidemux-core-2.7.0.ebuild | 3 ++- |
| 14 |
media-libs/avidemux-core/avidemux-core-9999.ebuild | 3 ++- |
| 15 |
media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild | 2 +- |
| 16 |
media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild | 2 +- |
| 17 |
media-video/avidemux/avidemux-2.7.0.ebuild | 1 + |
| 18 |
media-video/avidemux/avidemux-9999.ebuild | 1 + |
| 19 |
6 files changed, 8 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild |
| 22 |
index 92f9f8ec068..d1169d3d75c 100644 |
| 23 |
--- a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild |
| 24 |
+++ b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild |
| 25 |
@@ -34,7 +34,8 @@ COMMON_DEPEND=" |
| 26 |
xv? ( x11-libs/libXv:0 ) |
| 27 |
" |
| 28 |
RDEPEND="${COMMON_DEPEND} |
| 29 |
- !<media-video/avidemux-${PV}:${SLOT} |
| 30 |
+ !<media-libs/avidemux-core-${PV} |
| 31 |
+ !<media-video/avidemux-${PV} |
| 32 |
nls? ( virtual/libintl:0 ) |
| 33 |
" |
| 34 |
DEPEND="${COMMON_DEPEND} |
| 35 |
|
| 36 |
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild |
| 37 |
index 92f9f8ec068..d1169d3d75c 100644 |
| 38 |
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild |
| 39 |
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild |
| 40 |
@@ -34,7 +34,8 @@ COMMON_DEPEND=" |
| 41 |
xv? ( x11-libs/libXv:0 ) |
| 42 |
" |
| 43 |
RDEPEND="${COMMON_DEPEND} |
| 44 |
- !<media-video/avidemux-${PV}:${SLOT} |
| 45 |
+ !<media-libs/avidemux-core-${PV} |
| 46 |
+ !<media-video/avidemux-${PV} |
| 47 |
nls? ( virtual/libintl:0 ) |
| 48 |
" |
| 49 |
DEPEND="${COMMON_DEPEND} |
| 50 |
|
| 51 |
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
| 52 |
index fb70ffe36c2..2556ab1d6c6 100644 |
| 53 |
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
| 54 |
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
| 55 |
@@ -78,7 +78,7 @@ DEPEND="${COMMON_DEPEND} |
| 56 |
oss? ( virtual/os-headers:0 ) |
| 57 |
" |
| 58 |
RDEPEND="${COMMON_DEPEND} |
| 59 |
- !<media-libs/avidemux-plugins-${PV}:${SLOT} |
| 60 |
+ !<media-libs/avidemux-plugins-${PV} |
| 61 |
" |
| 62 |
|
| 63 |
S="${WORKDIR}/${MY_P}" |
| 64 |
|
| 65 |
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 66 |
index fb70ffe36c2..2556ab1d6c6 100644 |
| 67 |
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 68 |
+++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 69 |
@@ -78,7 +78,7 @@ DEPEND="${COMMON_DEPEND} |
| 70 |
oss? ( virtual/os-headers:0 ) |
| 71 |
" |
| 72 |
RDEPEND="${COMMON_DEPEND} |
| 73 |
- !<media-libs/avidemux-plugins-${PV}:${SLOT} |
| 74 |
+ !<media-libs/avidemux-plugins-${PV} |
| 75 |
" |
| 76 |
|
| 77 |
S="${WORKDIR}/${MY_P}" |
| 78 |
|
| 79 |
diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild |
| 80 |
index d1ae46fc076..3408af19d4a 100644 |
| 81 |
--- a/media-video/avidemux/avidemux-2.7.0.ebuild |
| 82 |
+++ b/media-video/avidemux/avidemux-2.7.0.ebuild |
| 83 |
@@ -39,6 +39,7 @@ DEPEND="${COMMON_DEPEND} |
| 84 |
" |
| 85 |
RDEPEND="${COMMON_DEPEND} |
| 86 |
nls? ( virtual/libintl:0 ) |
| 87 |
+ !<media-video/avidemux-${PV} |
| 88 |
" |
| 89 |
PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" |
| 90 |
|
| 91 |
|
| 92 |
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild |
| 93 |
index d1ae46fc076..3408af19d4a 100644 |
| 94 |
--- a/media-video/avidemux/avidemux-9999.ebuild |
| 95 |
+++ b/media-video/avidemux/avidemux-9999.ebuild |
| 96 |
@@ -39,6 +39,7 @@ DEPEND="${COMMON_DEPEND} |
| 97 |
" |
| 98 |
RDEPEND="${COMMON_DEPEND} |
| 99 |
nls? ( virtual/libintl:0 ) |
| 100 |
+ !<media-video/avidemux-${PV} |
| 101 |
" |
| 102 |
PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" |
Archives