gentoo resync : 09.03.2018

3 files changed, 58 insertions, 51 deletions

diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 7e6cb8ba3c2d..eb196d945a6d 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,5 +1,5 @@
-DIST fdk-aac-0.1.3.tar.gz 1982695 BLAKE2B 5624f255356dc6b1f3f021aaef22eaaf1b1e25da1bcbc5e1d936d0835eb151f06c498fbe362e2c6afb04d018e69ccdb6e3ca4be4407378df3cf4229000ca0973 SHA512 1cc78bdb31f0896b71de85afbebeb5f8ed97affccf74c20ad2c36e6baead0199f83bf987a28872a1229b116c17c161e4bbe197c5108fd749fd508ebfeeb7df56
 DIST fdk-aac-0.1.5.tar.gz 2091081 BLAKE2B 16dd8606f87480fbf13d06b9628ff8c4fef418b5c55fbf99931d25ee9de6c1dd710760be8766af995d0d678e8c94b2d3b17aa6cd0f5b2512ae9d4478d985d72a SHA512 579e96dae5638cfe2d3d5e84ab24a72ed50ed3b5a9d3c6eb2f434d3a5f4c575877a2ecf6cd7cf7a528eb2811b2014a861eaaac9ea5fc617c6423587525766f00
-EBUILD fdk-aac-0.1.3.ebuild 1217 BLAKE2B 94ed5ebff02d8f3f381b48bc721dbbf37f802b73cf80606602f40a84eeddf7b71891f855f14229b2552747e177cd5f508743029374991467861c4d0eeffe74a4 SHA512 3d89c2914371e463d9c01b23d46c53fc498a1a29f1abdb84494e8833a6dca4877a95d9f47f6ef9640aa52b59ce8cad62998a31a0c47baef2fdd4ff3cd3c1f9c2
+DIST fdk-aac-0.1.6.tar.gz 2091618 BLAKE2B e3036879e21677ea0ba6d6a030aff0568572e420217479b19312bc64daf0a4e94c1a0a6de561baa79f362186777f1414a4a1eb89bf80c1268767564f1a82708b SHA512 d4d14debeb6e424f4e2a1458ed7bebaa2c45ce54170c6e679286fd965f52286b6a6c1e944edbb4ea2302c3bb789c0f3cdab9c0d89618014ba4250b2f04d71d12
 EBUILD fdk-aac-0.1.5.ebuild 1329 BLAKE2B 4b253218fe7f3792205f1f4a49f825cb2e3659256309189cbac4176744957a9739c365eac282a45f43f0294bdef2204844ad064c7aa0d4dc0980f103574b212b SHA512 4d1cf29c86faf68d62604d324cc68132a386486fb7c88b5c54b893019fa59c9b14438a0011c701e1286ec5a6f1078313acf0eb8df17d27e741762d00807ae49b
+EBUILD fdk-aac-0.1.6.ebuild 1360 BLAKE2B 140c2622a15b32a10e6c79f249c15a591d5ae2b68f2e695662d84a221ae031b8fbb460258aaf823b5efec4fc318b312d1e77fc6795599c26c2a79a092df42344 SHA512 aaa3428c0840753488d2019a8d58524868d237a3d0c0324fd5ce77e7500e2bf0be8520ee0dfeda7d44963a2fba5280009ab5e3c40b6a607b3bc3cf480f1bcb0f
 MISC metadata.xml 426 BLAKE2B 701e014c8a2fb5649fc546c205d705e8c13e0b3acf2bd445c4058ffc96e607743c5e6c8c21e3c0f0941421064a169b18b3736bf5f34b979f36fedabdf0fe318d SHA512 217c0f757ba4c8bd4e649aab097900eebaa9097d6f56ea373e78de2f3a392d25401c8dbb654b80219bceaea7db7ff616f532174f4a5119bd1b3c093e9fc89da1
diff --git a/media-libs/fdk-aac/fdk-aac-0.1.3.ebuild b/media-libs/fdk-aac/fdk-aac-0.1.3.ebuild
deleted file mode 100644
index 72ea14de67a4..000000000000
--- a/media-libs/fdk-aac/fdk-aac-0.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git"
-	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	AUTOTOOLS_AUTORECONF=yes
-fi
-
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="Fraunhofer AAC codec library"
-HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
-
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${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
-
-LICENSE="FraunhoferFDK"
-SLOT="0"
-
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE="static-libs examples"
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-src_configure() {
-	local myeconfargs=(
-		"$(use_enable examples example)"
-	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	use examples && mv "${ED}/usr/bin/aac-enc" "${ED}/usr/bin/fdk-aac-enc"
-}
-
-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-0.1.6.ebuild
new file mode 100644
index 000000000000..228a1c8a1bf6
--- /dev/null
+++ b/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
@@ -0,0 +1,56 @@
+# 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/mstorsjo/${PN}.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+	inherit autotools git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~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() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable examples example)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+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"
+}