gentoo resync : 15.12.2019

4 files changed, 5 insertions, 62 deletions

diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 4d6c64e444c0..e45022e9bfa9 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,7 +2,6 @@ AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLA
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r1.ebuild 1768 BLAKE2B 862e5546b1fba5af977cecbe54590ff125274f244e4ecd0aeb161151653ba9fcc40903e19304f6808e1dfd1e90226497088423081a976c7bb19379866b309d6e SHA512 47ff47ce9945610f2cac2b5bfad15415133bcfa30b5f09bde8934efb27217892d21fcf13949e0d2bd5040d7de906122a62293eb840b3a2e4aa32c9482bdd583c
-EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
-EBUILD vidstab-9999.ebuild 1487 BLAKE2B 48a7211ee43e3f96a97e9dcf23e9781bebeb5da7f70b814d303d9a3effb053569857530edd326c977915ac13fa5697bbca59b6256b94837cd8e1b24aeda3065b SHA512 d1124e1c93b4d50e60a7b65b6046787baa15c3ff3a37dbe5ff06b4a67a0012ead3f9a709de6ebc370582d45bca6d1f45f51811f1bd627219f65a7030175748fb
+EBUILD vidstab-1.1.0-r2.ebuild 1768 BLAKE2B f126fb8c0bfe63e3deb83d6a956e94a1b2b8dd20523af1e13d26abdc56245dd889e02b9cdac69d2a71241c575ace678c00fc7427742674bc389867e84f138f94 SHA512 7e7b96d5e7852b08ebfafa761d20deb9d4889f58e68f5ff355085a9a495c17c479f17c8a2ef9a19561dbd3d8b3d7b5b76e78b26e3b56291d33f333486a53ea82
+EBUILD vidstab-9999.ebuild 1528 BLAKE2B 384143417b094da0cbb1299f6789ef890f81fa1efa0b13ab314e8831360b19312b28c92bb49efd97450260f42a9499e7c1533d586e762eac0c99654c1206cb97 SHA512 f72ca678d3999a9f2a0d194383529a08526d22dee764ac95097d0e57f7808d172d1da2e825842cd8c73b4504c097721aa47846a308fa124bb834ec4768c5be53
 MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
index 229007a4aa8d..7f3c294a36f2 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
diff --git a/media-libs/vidstab/vidstab-1.1.0.ebuild b/media-libs/vidstab/vidstab-1.1.0.ebuild
deleted file mode 100644
index 71caeda13785..000000000000
--- a/media-libs/vidstab/vidstab-1.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Video stabilization library"
-HOMEPAGE="http://public.hronopik.de/vid.stab/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/vid.stab-${PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="openmp cpu_flags_x86_sse2"
-PATCHES=(
-	"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch"
-)
-src_prepare() {
-	# USE=cpu_flags_x86_sse2 instead
-	sed -E 's#include (FindSSE)##' -i CMakeLists.txt
-	# strip some CFLAGS
-	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
-		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
-		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
-	done
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	use openmp && tc-check-openmp
-	local mycmakeargs=(
-		-DUSE_OMP="$(usex openmp)"
-		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd tests || die
-	local mycmakeargs=(
-		-DUSE_OMP="$(usex openmp)"
-	)
-	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
-	local BUILD_DIR="${BUILD_DIR}/tests"
-	cmake-utils_src_configure
-	cmake-utils_src_make
-	"${BUILD_DIR}"/tests || die
-}
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
index 447fa8556869..f4bd05f45203 100644
--- a/media-libs/vidstab/vidstab-9999.ebuild
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi