gentoo resync : 25.08.2020

3 files changed, 34 insertions, 38 deletions

diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 586f457fa5a8..7fce101dbe49 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
-DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-plugins-2.7.3.ebuild 4309 BLAKE2B 221f078e8a553d581c267fa8b70722d4c8bc7e3fdaeefc84d06adc832c0fb315ff396e35ac82757f0152102aa3ba09fd97b4592c9a6e5c12511cc376368274e4 SHA512 e3792244f82bef40c043258bbfc7fb0c9bc77e4aff1966926a76ab7f0693fb8c3c116f6f1fa330ea4eb4c3e45ea77295f5332b250ecedb17bec37c6edc363ff2
-EBUILD avidemux-plugins-2.7.4.ebuild 4225 BLAKE2B a4766dc2b32439917adec4a430736bbfaef169d95eec990d4769159822627cf68e852cb67e57e96b7793c3b47433da667b59287c13a4ebc7b6139d36bb36e0a2 SHA512 dc9d91e0ac345c1ea19a4f25b32b2d4012853ca22dd1cb8790a3258af6bc3926c7bad0dd81c2a474a1876e1c3148f7d1b23d8ab62ffae5615dc550f139547a0c
+DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
+EBUILD avidemux-plugins-2.7.4-r1.ebuild 4200 BLAKE2B ed5da75507e8fdbaaa792cff634ac0240a17b2fa0530e69d301184f5ca19acefb4918d870e44e912bb6e426f57fb13c54ad5237e551a2c87b61d3e386d0f1342 SHA512 86c6fedfaa7e3d0f0ea1bdac952faa3e9b84b332370d07dfc7dc550df42be2e4f2881ad5cd81ffa9ad4db5a6664f281557c685f7a30e57bb554ad90b8c5fc3f2
+EBUILD avidemux-plugins-2.7.6.ebuild 4208 BLAKE2B 5578b715fb2b2a1e4516df3f2cf2128ffa94f91f3f97c1cc5a2292e22e124347381c0ae8992bec35758bab25d45cf78a23d8b0f93598d442c337ed50b689556d SHA512 31f128df8a15326db2042e4268db6222fb10579fa4b990466b6a7437cde407b492c4b53d2cfa29926afeb3a0be9da52077c3f4c0d88f176d4f9b6fd42804e088
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
index 9648ec0e7afe..ed880a38ba5f 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	fribidi? ( dev-libs/fribidi )
 	jack? (
-		media-sound/jack-audio-connection-kit
+		virtual/jack
 		libsamplerate? ( media-libs/libsamplerate )
 	)
 	lame? ( media-sound/lame )
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
index be42b085469d..566c3a042992 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake python-single-r1
 
@@ -23,54 +23,54 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="${PYTHON_DEPS}
 	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
 	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
-	>=dev-lang/spidermonkey-1.5-r2:0=
+	dev-lang/spidermonkey:0=
 	dev-libs/libxml2:2
-	media-libs/a52dec:0
+	media-libs/a52dec
 	media-libs/libass:0=
-	media-libs/libmad:0
-	media-libs/libmp4v2:0
+	media-libs/libmad
+	media-libs/libmp4v2
 	media-libs/libpng:0=
-	virtual/libiconv:0
+	virtual/libiconv
 	aac? (
-		>=media-libs/faac-1.29.9.2:0
-		media-libs/faad2:0
+		media-libs/faac
+		media-libs/faad2
 	)
-	aften? ( media-libs/aften:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
-	amr? ( media-libs/opencore-amr:0 )
-	dcaenc? ( media-sound/dcaenc:0 )
-	dts? ( media-libs/libdca:0 )
+	aften? ( media-libs/aften )
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	dcaenc? ( media-sound/dcaenc )
+	dts? ( media-libs/libdca )
 	fdk? ( media-libs/fdk-aac:0= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
-	fribidi? ( dev-libs/fribidi:0 )
+	fribidi? ( dev-libs/fribidi )
 	jack? (
-		media-sound/jack-audio-connection-kit:0
-		libsamplerate? ( media-libs/libsamplerate:0 )
+		virtual/jack
+		libsamplerate? ( media-libs/libsamplerate )
 	)
-	lame? ( media-sound/lame:0 )
-	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
-	opus? ( media-libs/opus:0 )
-	pulseaudio? ( media-sound/pulseaudio:0 )
+	lame? ( media-sound/lame )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
 	truetype? ( media-libs/freetype:2 )
-	twolame? ( media-sound/twolame:0 )
-	vorbis? ( media-libs/libvorbis:0 )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
 	vpx? ( media-libs/libvpx:0= )
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
 	xv? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXv:0
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
 	)
-	xvid? ( media-libs/xvid:0 )
+	xvid? ( media-libs/xvid )
 "
 DEPEND="${COMMON_DEPEND}
-	oss? ( virtual/os-headers:0 )
+	oss? ( virtual/os-headers )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<media-libs/avidemux-plugins-${PV}
@@ -118,6 +118,7 @@ src_configure() {
 			-DJACK="$(usex jack)"
 			-DLAME="$(usex lame)"
 			-DNVENC="$(usex nvenc)"
+			-DOPENGL="$(usex opengl)"
 			-DOPUS="$(usex opus)"
 			-DOSS="$(usex oss)"
 			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
@@ -138,13 +139,8 @@ src_configure() {
 			-DUSE_EXTERNAL_LIBMP4V2=yes
 		)
 
-		if use qt5 ; then
-			mycmakeargs+=( -DENABLE_QT5=True )
-		fi
-
-		if use debug ; then
-			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-		fi
+		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
+		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
 		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done