gentoo (leap year) resync : 29.02.2020

3 files changed, 2 insertions, 66 deletions

diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index 84192c7b7127..b1d36d0bb16f 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -5,6 +5,5 @@ AUX qtav-1.12.0-multilib.patch 716 BLAKE2B 4cb5518cb14e91963e5371eafdf3f02452fb3
 AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a5215b806c862cf0a7d2fba7652aae27f5aa568f0bfbb1067b768be4c4d1a1458dab3e468cb7f55a1938e1c63b81 SHA512 1976e312bad83d0493be3af8652d537cca8905a1559d6dd021e4a3c234ac3e65e5743db6f2ac28bfd69ef8c2e0021b7d2144c8a4efea72dcc718bfc53e6d2370
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
-EBUILD qtav-1.12.0-r2.ebuild 1641 BLAKE2B 6c51dfd91ef106e3ae7a77a9c0996c6e8e91ef8aa76e903afd0ac77252f3fca78c13f574882a24cc59c813ab457770c3e0b2261bd97b4f6e8399c229a385b52e SHA512 177a561fca968e0939d60e940faa8bbab941ab5efa7e57e5efd909180fcde5f48d98be1e75e327f9d2d74211cbf5d01d49d665f1b001c7ed7ddae487dc328d8f
-EBUILD qtav-1.12.0.ebuild 1452 BLAKE2B 9002c43be94e25f31e50f8ad5d081cc6cbc824c245d84fe4fe843f2d8a21484c904b64f07b0d236a9f5d9aba18989e233d555f70d000547bc6a7f570411e6d5f SHA512 4c176409df4009c3b73d2461f738e8c7808906671b4628edebe598662631766b26a776cabec06104e6b3359c2c302a2a0ff7670dec8e1c438a1cc7f82f397ac1
+EBUILD qtav-1.12.0-r2.ebuild 1640 BLAKE2B 7b0b1f9dcf5b955114d4b3d70127cdf7ed5f7a63bf8a5ecd1566d2e5b4ac270f40e20f348f5b66c3758693c3f71245f32b79e76165a23b80e9f02e6149919835 SHA512 5fbf6ab29ac3a07393a7850ba76d1edd524cfc6925c82d1ea947d6ae9c7836a41fd81c2b97a1e5b899ef369953110f6ddb67499ad7d589cf2b028a4eef9399ed
 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild
index 8480fcb56a03..3cded19e1794 100644
--- a/media-libs/qtav/qtav-1.12.0-r2.ebuild
+++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild
@@ -14,7 +14,7 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gui libav opengl portaudio pulseaudio vaapi"
 REQUIRED_USE="gui? ( opengl )"
 
diff --git a/media-libs/qtav/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild
deleted file mode 100644
index 9f203d800ef2..000000000000
--- a/media-libs/qtav/qtav-1.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="QtAV"
-CAPI_HASH="b43aa93"
-inherit cmake-utils
-
-DESCRIPTION="Multimedia playback framework based on Qt + FFmpeg"
-HOMEPAGE="https://www.qtav.org"
-SRC_URI="https://github.com/wang-bin/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64"
-IUSE="gui libav opengl portaudio pulseaudio vaapi"
-REQUIRED_USE="gui? ( opengl )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	gui? ( dev-qt/qtsql:5 )
-	libav? (
-		media-video/libav:=
-		x11-libs/libX11
-	)
-	!libav? ( media-video/ffmpeg:= )
-	opengl? ( dev-qt/qtopengl:5 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	cp "${WORKDIR}/${P}-capi.h-${CAPI_HASH}" contrib/capi/capi.h \
-		|| die "Failed to add missing header"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_PLAYERS=$(usex gui)
-		-DBUILD_QT5OPENGL=$(usex opengl)
-		-DHAVE_PORTAUDIO=$(usex portaudio)
-		-DHAVE_PULSE=$(usex pulseaudio)
-		-DHAVE_VAAPI=$(usex vaapi)
-	)
-
-	cmake-utils_src_configure
-}