Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
Date: Thu, 15 Nov 2018 15:55:55
Message-Id: 1542297341.4e59daaee7cd6cb65079cd01408bedbbfa43b214.polynomial-c@gentoo
1 commit: 4e59daaee7cd6cb65079cd01408bedbbfa43b214
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 15 15:51:06 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 15 15:55:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e59daae
7
8 media-video/ffmpeg: Added sub-slot operator for dev-libs/openssl.
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-video/ffmpeg/ffmpeg-3.2.6.ebuild | 2 +-
14 media-video/ffmpeg/ffmpeg-3.2.7.ebuild | 2 +-
15 media-video/ffmpeg/ffmpeg-3.3.4.ebuild | 2 +-
16 media-video/ffmpeg/ffmpeg-3.3.6.ebuild | 2 +-
17 media-video/ffmpeg/ffmpeg-3.3.8.ebuild | 2 +-
18 media-video/ffmpeg/ffmpeg-3.4.5.ebuild | 2 +-
19 media-video/ffmpeg/ffmpeg-4.0.2.ebuild | 2 +-
20 media-video/ffmpeg/ffmpeg-4.0.3.ebuild | 2 +-
21 media-video/ffmpeg/ffmpeg-4.1.ebuild | 2 +-
22 media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +-
23 10 files changed, 10 insertions(+), 10 deletions(-)
24
25 diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
26 index 7969d816201..010f59065ed 100644
27 --- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
28 +++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
29 @@ -211,7 +211,7 @@ RDEPEND="
30 modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
31 openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
32 opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
33 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
34 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
35 opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
36 pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
37 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
38
39 diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
40 index 63dea731274..b798bf59bc2 100644
41 --- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
42 +++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
43 @@ -211,7 +211,7 @@ RDEPEND="
44 modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
45 openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
46 opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
47 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
48 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
49 opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
50 pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
51 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
52
53 diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
54 index 9bfc5b0be2b..e2134969906 100644
55 --- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
56 +++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
57 @@ -227,7 +227,7 @@ RDEPEND="
58 modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
59 openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
60 opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
61 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
62 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
63 opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
64 pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
65 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
66
67 diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
68 index 03289d69b79..8edfe99d1be 100644
69 --- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
70 +++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
71 @@ -227,7 +227,7 @@ RDEPEND="
72 modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
73 openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
74 opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
75 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
76 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
77 opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
78 pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
79 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
80
81 diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
82 index d9e3e521ff3..31f31bd7f75 100644
83 --- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
84 +++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
85 @@ -227,7 +227,7 @@ RDEPEND="
86 modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
87 openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
88 opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
89 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
90 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
91 opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
92 pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
93 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
94
95 diff --git a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
96 index 07123b94bbf..671893a1624 100644
97 --- a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
98 +++ b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
99 @@ -220,7 +220,7 @@ RDEPEND="
100 openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
101 opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
102 opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
103 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
104 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
105 opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
106 pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
107 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
108
109 diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
110 index dc2945d4871..0ecdf810c4b 100644
111 --- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
112 +++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
113 @@ -262,7 +262,7 @@ RDEPEND="
114 RDEPEND="${RDEPEND}
115 libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
116 !libressl? (
117 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
118 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
119 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
120 )
121 "
122
123 diff --git a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
124 index 3ca1f9a33e6..2a10fdca948 100644
125 --- a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
126 +++ b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
127 @@ -262,7 +262,7 @@ RDEPEND="
128 RDEPEND="${RDEPEND}
129 libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
130 !libressl? (
131 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
132 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
133 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
134 )
135 "
136
137 diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.ebuild
138 index 3ca1f9a33e6..2a10fdca948 100644
139 --- a/media-video/ffmpeg/ffmpeg-4.1.ebuild
140 +++ b/media-video/ffmpeg/ffmpeg-4.1.ebuild
141 @@ -262,7 +262,7 @@ RDEPEND="
142 RDEPEND="${RDEPEND}
143 libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
144 !libressl? (
145 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
146 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
147 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
148 )
149 "
150
151 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
152 index 3ca1f9a33e6..2a10fdca948 100644
153 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild
154 +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
155 @@ -262,7 +262,7 @@ RDEPEND="
156 RDEPEND="${RDEPEND}
157 libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
158 !libressl? (
159 - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
160 + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
161 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
162 )
163 "