gentoo resync : 14.05.2020

4 files changed, 9 insertions, 18 deletions

diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 6c40afbe4957..684e1aa08bc7 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -3,7 +3,7 @@ AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316
 DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
 DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
-EBUILD aubio-0.4.7-r1.ebuild 2535 BLAKE2B 18068528d43a0560333558f37a24e2f3cf419c6849f17e2b05468d16674fbe18434829cc2302933a72999b3800dbefa1c68914940564ebcdd50b2dfaa85380d5 SHA512 62cf943d925027d460e8ce96d62a426c31d50e7ee23ee35bb11f52a1e52d40e1a7131616851d2daae61e797e93cdf162ab584a717a2f18d41de5e5d6064fcce5
-EBUILD aubio-0.4.8.ebuild 2538 BLAKE2B c40bd3ca2571a8575f16534d95dd315ae49f91b1478e46b90f2c6e1efa286db1d90eb83057ada627d5c41ec536d35b3d356469b30201ceee7f6ac5947e163de5 SHA512 2ee418860130e370526dbdfaae67c8d8f13c6ab40177362e5b0e34c16b9953a66592832f909ef2e512aef9dd972940d032a1fb304d03e05089595b5d84361c1f
-EBUILD aubio-0.4.9.ebuild 2563 BLAKE2B 112a2774181285b6742243e9d373551985da5cc7559d74ba67b1433a53f968d570d246d42d8d3a63f4802355a75b24b5223766f28417ad81cf372a1f9b6579cc SHA512 61f1d431c87e7f322770e388e5482b758da167c139e620b0473f9f66381482ee7f30f45bdb7cc5be715660b2f9e9c2c3d51c31b07b5db479db8cee63a7760f23
+EBUILD aubio-0.4.7-r1.ebuild 2476 BLAKE2B bbb66cc2cdecae57c6ffd93e92199f06ac35c8b77c52a656e435956b1391a83d4ac117a471532fb99d713516254a8a6c27bf65653528dcd7493d7e1ba0901163 SHA512 d0c1d1ec2f24963f74748d83f490b7100f02682e2f15897686b0acef265175b2b821623d7a10b9f208c2b5007145022c191a764777a57c14ddc2904ae899421e
+EBUILD aubio-0.4.8.ebuild 2480 BLAKE2B 019e89355725965392524f13f48e85f346ba4c563e6c8d075428ac08dc2317f7b32001533c8d5ea9d0c0e391c1eedba989ce9e34f092cadccd39809480f558aa SHA512 644fbed7d586997c01c6a696f4329709115ed5860c0c9ab4e694004f44c22b9095e7b87a109bf908b115931c0d56aa54d41c46c929b60a35975be0247c685ac7
+EBUILD aubio-0.4.9.ebuild 2504 BLAKE2B b3f9e65f3542d02851de50e4c3b5d120f623d7d526fe291af1d2894c1e40aa9c75b0392e941ce159a9d14584104c7f1ddb3c03b20a5770c0f3b58a12817ee523 SHA512 0dd0d11550ffb12adade15a570d1264126c6f63f67266903a26b6723aaee77f0bf00dea59950ab327c50bb9d66a59e6164b9fc22f5badb4b4d41ea4f302f6eee
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.7-r1.ebuild b/media-libs/aubio/aubio-0.4.7-r1.ebuild
index 544e1262ead4..977ee51acd4e 100644
--- a/media-libs/aubio/aubio-0.4.7-r1.ebuild
+++ b/media-libs/aubio/aubio-0.4.7-r1.ebuild
@@ -15,14 +15,11 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-2.6:0= )
-		libav? ( >=media-video/libav-9:0= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-libs/aubio/aubio-0.4.8.ebuild b/media-libs/aubio/aubio-0.4.8.ebuild
index c0e64da911d4..cb37129ec5ca 100644
--- a/media-libs/aubio/aubio-0.4.8.ebuild
+++ b/media-libs/aubio/aubio-0.4.8.ebuild
@@ -15,14 +15,11 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-2.6:0= )
-		libav? ( >=media-video/libav-9:0= )
-	)
+	ffmpeg? (  >=media-video/ffmpeg-2.6:0= )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index b03de834c4f5..117ce73c4de1 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -15,14 +15,11 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-2.6:0= )
-		libav? ( >=media-video/libav-9:0= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )