gentoo resync : 10.01.2018

3 files changed, 122 insertions, 21 deletions

diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 78c48601e0aa..96263bd90dac 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,5 +1,7 @@
 AUX avidemux-core-2.6.20-fix-cmake.patch 1020 BLAKE2B 775653f2d8fdf15f56025c44a3b938d6e978606eaa475e6ca67446f3c754705cb3f3f1253293dc62a8d85536e47e8371b6fb128f5fecf04b847a488899be16d4 SHA512 82f4a5c3328d593bc5b2dbabc339eb19ceb6bc295984ca1fda4efbfd0f0a3687d39d07f36cf4338230396db849012f3d8ea053404f78317712741571cf060f0e
 DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
+DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
 EBUILD avidemux-core-2.6.20-r2.ebuild 2592 BLAKE2B e16a93a949c283c64fceb9aad8ba9e252fb7c4c0ba19e4214e709614499994dc49e2a538fad86ab3bcac25b1a1a754db264af320f2cef0577a72b40c2b026d0f SHA512 3e0c2cbb97f734a7ee9d386241bda083fe41d9f0777bad50db6f017fca121aa0cbe4e699d28a6499d7f94b0238da6fa7bc96f9f0bef359a64f000b27b562efad
-EBUILD avidemux-core-9999.ebuild 2563 BLAKE2B d0f54a429d05b82d05573c590d036ca6e4274a3f4b09c460cbd3654c065119707eea74538f38c46cbbd8343274f4977bdcd95b2767d098dd1541c83a6df3a69a SHA512 7a428f7961b8834d6fb4eba6153166d702f99307fb954e97667b0acb97ad90001bf26d747cb4e9ccdae17b24320f7bf2b6e539d62e8f044cbf29a270e5d93026
+EBUILD avidemux-core-2.7.0.ebuild 2501 BLAKE2B fc58cb54d85a4b3283fa0a7e624efee33097afe4660f155ceb9bc17eac273575c105c50439438f43480562a71b111c0c9a0a2386817cc2f44475569bc140916e SHA512 e8bc0a2df509f16cc945be16e09ace874d2fea23810eaea69788952458c7cd90b02261a6765f16d61da28057296976fa581c79c74c2bfcaf55bf4d9775fb89b6
+EBUILD avidemux-core-9999.ebuild 2501 BLAKE2B fc58cb54d85a4b3283fa0a7e624efee33097afe4660f155ceb9bc17eac273575c105c50439438f43480562a71b111c0c9a0a2386817cc2f44475569bc140916e SHA512 e8bc0a2df509f16cc945be16e09ace874d2fea23810eaea69788952458c7cd90b02261a6765f16d61da28057296976fa581c79c74c2bfcaf55bf4d9775fb89b6
 MISC metadata.xml 566 BLAKE2B 4298f411df7407c11de8f5c2cb6bc012223ae9c4e2a302823ee243309510510ad72da5b362265567ba8786476702d42c45c68077c84d9a6929f4d6cc44a29037 SHA512 031ee8ca49399bfb081d3aa2417604de938b701ba671f1de77df1c6f0abdb558d49ebf1ff9d3776f77757236ce05e981bc4a44fc2d1f164e0b499ae6b1b52b6a
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
new file mode 100644
index 000000000000..92f9f8ec0689
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}
+	inherit git-r3
+else
+	MY_PN="${PN/-core/}"
+	MY_P="${MY_PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+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] )
+	vaapi? ( x11-libs/libva:0= )
+	vdpau? ( x11-libs/libvdpau:0 )
+	xv? ( x11-libs/libXv:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-video/avidemux-${PV}:${SLOT}
+	nls? ( virtual/libintl:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+S="${WORKDIR}/${MY_P}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-ffmpeg ; then
+		# Preparations to support the system ffmpeg. Currently fails because
+		# it depends on files the system ffmpeg doesn't install.
+		local error="Failed to remove bundled ffmpeg."
+
+		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+			buildCore/ffmpeg || die "${error}"
+		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+			-i avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -e 's/include(admFFmpegBuild)//g' \
+			-i avidemux_core/CMakeLists.txt || die "${error}"
+	fi
+}
+
+src_configure() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	local mycmakeargs=(
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		-DGETTEXT="$(usex nls)"
+		-DNVENC="$(usex nvenc)"
+		-DSDL="$(usex sdl)"
+		-DLIBVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	if use debug ; then
+		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile -j1
+}
+
+src_install() {
+	cmake-utils_src_install -j1
+}
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 6d3d4eb7d5f9..92f9f8ec0689 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -1,22 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.6"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
-
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}
-
 	inherit git-r3
 else
 	MY_PN="${PN/-core/}"
@@ -24,6 +13,15 @@ else
 	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
+inherit cmake-utils
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
 
 # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
 COMMON_DEPEND="
@@ -31,7 +29,7 @@ COMMON_DEPEND="
 	nvenc? ( media-video/nvidia_video_sdk )
 	sdl? ( media-libs/libsdl:0 )
 	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
-	vaapi? ( x11-libs/libva:0 )
+	vaapi? ( x11-libs/libva:0= )
 	vdpau? ( x11-libs/libvdpau:0 )
 	xv? ( x11-libs/libXv:0 )
 "
@@ -52,13 +50,16 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	if use system-ffmpeg ; then
-		# Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
-		local error="Failed to remove ffmpeg."
-
-		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
-		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
+		# Preparations to support the system ffmpeg. Currently fails because
+		# it depends on files the system ffmpeg doesn't install.
+		local error="Failed to remove bundled ffmpeg."
+
+		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+			buildCore/ffmpeg || die "${error}"
+		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+			-i avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -e 's/include(admFFmpegBuild)//g' \
+			-i avidemux_core/CMakeLists.txt || die "${error}"
 	fi
 }