gentoo resync : 28.04.2018

3 files changed, 46 insertions, 26 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d2de2aefad91..e04f868624d8 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,6 +17,6 @@ EBUILD ffmpeg-3.3.5.ebuild 15958 BLAKE2B c5d4de18818f991e975e5d4e4af6ba49335c1f5
 EBUILD ffmpeg-3.3.6.ebuild 15957 BLAKE2B eb439e2f522e49991df4143b4ec69b428e4ea69c97f6aab1d1aa19628d0b311adfb484cd7d807c44b90a8e74c87255992fa8181ad8ddee51ed515424bc7e60b1 SHA512 9329ae807ed9c5e3f63f2ca9c1c658728f924dca5885375438ccc01a22ee9f21da208cfaa62329eb5df77200ba27fc0ffeb3250b6507e6731210b46e973dbd96
 EBUILD ffmpeg-3.4.2-r1.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f
 EBUILD ffmpeg-3.4.2.ebuild 15578 BLAKE2B dd02f1200d7c713f06c606a40386f6432dc4c1b796614e1a4f1faf13e504fd9634e1557d7a70cfb94629228090ca66916510b6328dfde5d0bc0e4cd44a103049 SHA512 b95e7fd722745507d91f23bd365fec8a2193d589bc41821adfb1123fa844bf869eb5e02eb2c3bb936cf4f69b0437fdf875f7bddf821d04105d29b667678abdd8
-EBUILD ffmpeg-4.0.ebuild 16246 BLAKE2B a679ca4d7edb41d99b055e4a7228c15bcc4bbd0f8dc7e3935272c223ae13299c7d1e56c0c7527b8fec3971f63bf1c66c97c505a84483ccede9d07875a5d3f072 SHA512 49990d31b94deb94871ebea86ad9b802cf6ac6dedbd8955af64bb3524147e462904ee8b57d0fb5796ad34f90bfba92770b23d702443c06033832b95ba4754e20
-EBUILD ffmpeg-9999.ebuild 16306 BLAKE2B 907cea2f799f2e20640a063c0bdee755c8b6a5167f52c4d86f4e0b988efab21ea87f17181e5771b0dd58e71fc0167805c4e14ffc12dd4a680fdc3267e17b41ef SHA512 d4779109f7dbc89078c21b46599593efb769a7fbad023c7b7937981116241e372f4ecd3173cadcb1003849dd42be15c426a3e9f85c49117c2d0f68ccf38d49a1
+EBUILD ffmpeg-4.0.ebuild 16461 BLAKE2B e4989ecbe8f21affe84c87617dec6e5ba785bf9bbed740488097c229de8a6a01dbb1e9898bae5276c9fd74dcf084704c559ba03c83f67a5dbb1dd47f21ced3c4 SHA512 1b383d0e60cae4b484dd17e01b34f37359951991f1be5823aa6cb797094b7e281a3f0b41b4b95fadf7cb5a4806a28a26bfa651cf145028b0727d697d91d614dd
+EBUILD ffmpeg-9999.ebuild 16521 BLAKE2B 388f7d528159be1ebbba172ec58f0e2b02a509f000ab33a757579311b24b8a169bb1183960694f13bd6796f4f41f117ad0ba514a44e9d29de7a3bb386929566f SHA512 4d0d216c765c6645e9b5d8fc30dd61ab7cafe9663cbc42066793607ebb7c486ecbbee5c08ef9aa81da14ca4aff946e7db306f2f1b197681d6237e447f21777da
 MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85
diff --git a/media-video/ffmpeg/ffmpeg-4.0.ebuild b/media-video/ffmpeg/ffmpeg-4.0.ebuild
index 22e4cd2f2d14..480732eac83b 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.ebuild
@@ -64,9 +64,9 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		+gpl +hardcoded-tables +iconv libressl:libtls lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
+		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
 		# libavdevice options
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
@@ -196,7 +196,6 @@ RDEPEND="
 	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
 	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
 	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
 	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
 	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
 	iec61883? (
@@ -224,7 +223,6 @@ RDEPEND="
 	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
 	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
@@ -257,6 +255,19 @@ RDEPEND="
 	postproc? ( !media-libs/libpostproc )
 "
 
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	!libressl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+	)
+"
+
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( sys-apps/texinfo )
@@ -287,7 +298,7 @@ REQUIRED_USE="
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
 RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -312,7 +323,7 @@ multilib_src_configure() {
 	local myconf=( ${EXTRA_FFMPEG_CONF} )
 
 	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
 	use samba && myconf+=( --enable-version3 )
 
 	# Encoders
@@ -347,11 +358,10 @@ multilib_src_configure() {
 		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
 	done
 
-	# Incompatible features: openssl and gnutls
-	# openssl support provides a (strict) superset of gnutls support as of 2017.11.30
-	# So, we warn the user and disable gnutls
-	if use openssl && use gnutls; then
-		ewarn "openssl and gnutls are mutually exclusive in ${PN}, disabling gnutls since openssl provides more features"
+	# Incompatible features: openssl or libressl and gnutls
+	if use libressl ; then
+		myconf+=( --disable-gnutls --disable-openssl )
+	elif use openssl ; then
 		myconf+=( --disable-gnutls )
 	fi
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 40d7a117ea58..bd45bac1d298 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -64,9 +64,9 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		+gpl +hardcoded-tables +iconv libressl:libtls lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
+		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
 		# libavdevice options
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
@@ -196,7 +196,6 @@ RDEPEND="
 	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
 	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
 	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
 	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
 	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
 	iec61883? (
@@ -224,7 +223,6 @@ RDEPEND="
 	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
 	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
@@ -257,6 +255,19 @@ RDEPEND="
 	postproc? ( !media-libs/libpostproc )
 "
 
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	!libressl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+	)
+"
+
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( sys-apps/texinfo )
@@ -287,7 +298,7 @@ REQUIRED_USE="
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
 RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -312,7 +323,7 @@ multilib_src_configure() {
 	local myconf=( ${EXTRA_FFMPEG_CONF} )
 
 	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
 	use samba && myconf+=( --enable-version3 )
 
 	# Encoders
@@ -347,11 +358,10 @@ multilib_src_configure() {
 		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
 	done
 
-	# Incompatible features: openssl and gnutls
-	# openssl support provides a (strict) superset of gnutls support as of 2017.11.30
-	# So, we warn the user and disable gnutls
-	if use openssl && use gnutls; then
-		ewarn "openssl and gnutls are mutually exclusive in ${PN}, disabling gnutls since openssl provides more features"
+	# Incompatible features: openssl or libressl and gnutls
+	if use libressl ; then
+		myconf+=( --disable-gnutls --disable-openssl )
+	elif use openssl ; then
 		myconf+=( --disable-gnutls )
 	fi