gentoo resync : 03.11.2019

3 files changed, 9 insertions, 66 deletions

diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index be21e3474adc..6613e299c6a1 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,7 +1,5 @@
-DIST fdk-aac-0.1.5.tar.gz 2091081 BLAKE2B 16dd8606f87480fbf13d06b9628ff8c4fef418b5c55fbf99931d25ee9de6c1dd710760be8766af995d0d678e8c94b2d3b17aa6cd0f5b2512ae9d4478d985d72a SHA512 579e96dae5638cfe2d3d5e84ab24a72ed50ed3b5a9d3c6eb2f434d3a5f4c575877a2ecf6cd7cf7a528eb2811b2014a861eaaac9ea5fc617c6423587525766f00
-DIST fdk-aac-0.1.6.tar.gz 2091618 BLAKE2B e3036879e21677ea0ba6d6a030aff0568572e420217479b19312bc64daf0a4e94c1a0a6de561baa79f362186777f1414a4a1eb89bf80c1268767564f1a82708b SHA512 d4d14debeb6e424f4e2a1458ed7bebaa2c45ce54170c6e679286fd965f52286b6a6c1e944edbb4ea2302c3bb789c0f3cdab9c0d89618014ba4250b2f04d71d12
 DIST fdk-aac-2.0.0.tar.gz 2864593 BLAKE2B beaefd5186a6253496a656ccea514e764e6c6515b46ea0fa324f66985af8374f3813afddb29018da12d28d1672ebe10821f5e4e98d131ad4fb77a3d01ffab234 SHA512 40b02a9e42e17015fa6531c7b7eb51098ab43224c11c1c85e981d950642ffc6884146367cb423062b1da11679020ee5c5779dce5f4dc62175c8bf471831ed918
-EBUILD fdk-aac-0.1.5.ebuild 1307 BLAKE2B a802ea00113afa73b8e4c4178248f9ff21c810898226547fa55ff2b9e281c3af926137e90d5a22b1ad2ccc906fdbbbdc7e4f09db7bfaa0621c37f85d7411506d SHA512 9d1c91074e55a8181798a77e2b8bb790e5158aaecb3a25a55305c2667f017bdf5f3640982c2193389fc24a18461990ebdea724f513ac80f5665e486caeb2bdbc
-EBUILD fdk-aac-0.1.6.ebuild 1338 BLAKE2B 87627d786f70e811f549544522e802211050d6a150cc57b49784f814de88ff171529d89e2f88a54127912a14e7de7cfd26680d631800c25e969ec4cb68f69494 SHA512 165da2c688e835db2121fa0bc23b17db6e1cc0c13c64b8caae696b10499a77db3928e73b9e70321a8dfb27a0ee84d37d1daa2cfd64fbb5fb03094a0dec3b0797
+DIST fdk-aac-2.0.1.tar.gz 2865456 BLAKE2B 79c66956b3c43138fb34448398cf104a021757332b2af6d4493bce8c4f9dfdf97a38d1f00c3f1a3f91ffb3b2ce2bb0bdc982e3f92a1ffe7e5f0d1c2f0ef8ca99 SHA512 08209bbd060edafe7b607c9e1394cd03df4f98df6f32b4be21d34d1ab491a7447ed592785546c040126767bd31980121ca6a31aba06eaf90558b14228e302d82
 EBUILD fdk-aac-2.0.0.ebuild 1328 BLAKE2B 2115fac8a61dd82aadfb945f302986063c5acd153a35a7db0bee3da0ffab34ea82a3d604429c3b33d3262f1392a6bf55e3cd905bcc08aaf70b1c7e4e0712a9d9 SHA512 7022b77587d04fc0be13e2cf4d44900e1e18c19e34fab152180b96e1b13b6dade6e3295d9c13859d2f8645011965b1caa91cfb1ccb8287d5f508ada38eff0537
+EBUILD fdk-aac-2.0.1.ebuild 1334 BLAKE2B 24b35ce67bf82d20e2a1c38e3104120647798eeb5e499de206249d9c501c77e80a2b1a50aa0cdc813dbdf2914e263e061b46ef978fda44f37cb544a9926176f9 SHA512 5d59c5b50d172f65261ea501c4530e08af44003ee2e265a646b194a0c9f294320fd4a9fbf184b949e6fe45f1f1ed52f4f229d60f253dd6703138fd5b9e67e7ae
 MISC metadata.xml 426 BLAKE2B 701e014c8a2fb5649fc546c205d705e8c13e0b3acf2bd445c4058ffc96e607743c5e6c8c21e3c0f0941421064a169b18b3736bf5f34b979f36fedabdf0fe318d SHA512 217c0f757ba4c8bd4e649aab097900eebaa9097d6f56ea373e78de2f3a392d25401c8dbb654b80219bceaea7db7ff616f532174f4a5119bd1b3c093e9fc89da1
diff --git a/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild b/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
deleted file mode 100644
index 3f58741c9d26..000000000000
--- a/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	inherit autotools git-r3
-else
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~x64-macos"
-	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
-		SRC_URI="mirror://gentoo/${P}.tar.xz"
-	else # Official release
-		SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	fi
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="Fraunhofer AAC codec library"
-HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
-LICENSE="FraunhoferFDK"
-# subslot == N where N is libfdk-aac.so.N
-SLOT="0/1"
-
-IUSE="static-libs examples"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable examples example)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		mv "${ED%/}/usr/bin/"{,fdk-}aac-enc || die
-	fi
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use examples && einfo "aac-enc was renamed to fdk-aac-enc to prevent file collision with other packages"
-}
diff --git a/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.1.ebuild
index b8197f01d0af..4faac04a34d3 100644
--- a/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
@@ -16,13 +18,11 @@ else
 	fi
 fi
 
-inherit multilib-minimal
-
 DESCRIPTION="Fraunhofer AAC codec library"
 HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
 LICENSE="FraunhoferFDK"
 # subslot == N where N is libfdk-aac.so.N
-SLOT="0/1"
+SLOT="0/2"
 
 IUSE="static-libs examples"
 
@@ -44,11 +44,11 @@ multilib_src_install_all() {
 	einstalldocs
 
 	if use examples; then
-		mv "${ED%/}/usr/bin/"{,fdk-}aac-enc || die
+		mv "${ED}/usr/bin/"{,fdk-}aac-enc || die
 	fi
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {