From b9ef7cab6264f1838672efbbcb4ba3b3abd5323f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 9 Dec 2017 09:14:02 +0000
Subject: gentoo resync : 09.12.2017

---
 media-libs/avidemux-core/Manifest                  |  2 +-
 media-libs/avidemux-core/avidemux-core-9999.ebuild | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'media-libs/avidemux-core')

diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index d51bdbe849b6..38cbceafb4d9 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,5 +1,5 @@
 AUX avidemux-core-2.6.20-fix-cmake.patch 1020 BLAKE2B 775653f2d8fdf15f56025c44a3b938d6e978606eaa475e6ca67446f3c754705cb3f3f1253293dc62a8d85536e47e8371b6fb128f5fecf04b847a488899be16d4 SHA512 82f4a5c3328d593bc5b2dbabc339eb19ceb6bc295984ca1fda4efbfd0f0a3687d39d07f36cf4338230396db849012f3d8ea053404f78317712741571cf060f0e
 DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
 EBUILD avidemux-core-2.6.20-r2.ebuild 2592 BLAKE2B e16a93a949c283c64fceb9aad8ba9e252fb7c4c0ba19e4214e709614499994dc49e2a538fad86ab3bcac25b1a1a754db264af320f2cef0577a72b40c2b026d0f SHA512 3e0c2cbb97f734a7ee9d386241bda083fe41d9f0777bad50db6f017fca121aa0cbe4e699d28a6499d7f94b0238da6fa7bc96f9f0bef359a64f000b27b562efad
-EBUILD avidemux-core-9999.ebuild 2544 BLAKE2B fc352e3df9a0078f7a56fbe51459108bea8bd2fc10b7d1c1f7d3841ab9a48446c24e219bc4c450708b4fba65f5e94e922b42f08c4a75b7e4cde5b11b2dadb627 SHA512 de9308bc45c70d19d14d0751131027f3f4443bedc7bcbd1f1de8823448ae38684f7c4f8fb107e65db00a402cb4e72327a8d47283218be920cafda97a6fc7cb3a
+EBUILD avidemux-core-9999.ebuild 2563 BLAKE2B d0f54a429d05b82d05573c590d036ca6e4274a3f4b09c460cbd3654c065119707eea74538f38c46cbbd8343274f4977bdcd95b2767d098dd1541c83a6df3a69a SHA512 7a428f7961b8834d6fb4eba6153166d702f99307fb954e97667b0acb97ad90001bf26d747cb4e9ccdae17b24320f7bf2b6e539d62e8f044cbf29a270e5d93026
 MISC metadata.xml 566 BLAKE2B 4298f411df7407c11de8f5c2cb6bc012223ae9c4e2a302823ee243309510510ad72da5b362265567ba8786476702d42c45c68077c84d9a6929f4d6cc44a29037 SHA512 031ee8ca49399bfb081d3aa2417604de938b701ba671f1de77df1c6f0abdb558d49ebf1ff9d3776f77757236ce05e981bc4a44fc2d1f164e0b499ae6b1b52b6a
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 9b4fbca2cefa..6d3d4eb7d5f9 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit cmake-utils
 
@@ -26,22 +26,20 @@ else
 fi
 
 # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
-	!<media-video/avidemux-${PV}:${SLOT}
+COMMON_DEPEND="
 	dev-db/sqlite:3
+	nvenc? ( media-video/nvidia_video_sdk )
 	sdl? ( media-libs/libsdl:0 )
 	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
-	xv? ( x11-libs/libXv:0 )
 	vaapi? ( x11-libs/libva:0 )
 	vdpau? ( x11-libs/libvdpau:0 )
-	nvenc? ( media-video/nvidia_video_sdk )
+	xv? ( x11-libs/libXv:0 )
 "
-RDEPEND="
-	$DEPEND
+RDEPEND="${COMMON_DEPEND}
+	!<media-video/avidemux-${PV}:${SLOT}
 	nls? ( virtual/libintl:0 )
 "
-DEPEND="
-	$DEPEND
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	!system-ffmpeg? ( dev-lang/yasm[nls=] )
@@ -76,11 +74,11 @@ src_configure() {
 	local mycmakeargs=(
 		-DAVIDEMUX_SOURCE_DIR='${S}'
 		-DGETTEXT="$(usex nls)"
+		-DNVENC="$(usex nvenc)"
 		-DSDL="$(usex sdl)"
 		-DLIBVA="$(usex vaapi)"
 		-DVDPAU="$(usex vdpau)"
 		-DXVIDEO="$(usex xv)"
-		-DNVENC="$(usex nvenc)"
 	)
 
 	if use debug ; then
-- 
cgit v1.2.3