gentoo resync : 16.06.2019

4 files changed, 42 insertions, 53 deletions

diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index f92b39e68619..22cb41b64f93 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,7 +1,5 @@
 AUX libilbc-2.0.2-ppc_ppc64_sparc.patch 933 BLAKE2B 90bb615cb33dfb1eae9d276b08df85ed37b47f127fe9e88a983120d25c57cf669ed0e166d63b3b51e5ac29701107b9be9b683bb36b3e868177bdb2efb1b22e88 SHA512 6a468dff6c42d2e0628466cb9c71639052a17640c78134ee98634c473e4da60296b86eec8f8b8214f64d298d80587dcd03722a9cfc2e588efb73f72f4954eba1
-DIST libilbc-1.1.1.tar.xz 302324 BLAKE2B 726d53fc638f9d019b6d50a3ec463350efd59510ce15b9d6af30fc0ad6094f5acc53c4a5c2e77d17fdcd35f3e63bceb310716eb175e82ca7226dec023cb96df4 SHA512 7c9fa6da4d8b32fd49ea62f9e876e385930501c9caedcafac94ea74b9372722b06dd28062dc4fcca765ad6c519cfb52bb595d396ca50d361f563c715f6679845
 DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
-EBUILD libilbc-1.1.1.ebuild 738 BLAKE2B a62dd1e51dc9829091d0391f3f55a213a7c9650530afe630917ceb9d6ebe62345b763e351533aabca791dbce7f6f55628b464bda3e723b444bbd4e780dec0f29 SHA512 5b57dfc0be813d600f23a129fe31982ecc40d0b376f2f3bd9566f5a2f52f96bc99d6db71cec3a9fc63bfa20f2f8db5a1e2185030a1388ec4e117db74c5f7afbc
-EBUILD libilbc-2.0.2.ebuild 727 BLAKE2B d6e996a9b39fcbe50867bf68608d060ae7abd2c463eff1e21e93f84b9028a9779848a0eeb63b6d5e354d2ef4c5fb11aa46e8e344f83c70da9378072aa1c7a3db SHA512 925ed38c2eb24afbb882015208d9bbbc2fedcb6a228a60e34d23b06343ee0cbd65f64c7d75ace1685b3b5f6c0dda7ec75ebd50cf427f178414bc87ea8687d4c5
-EBUILD libilbc-9999.ebuild 673 BLAKE2B 4c40b095479be75fc7dd4e5c9a1e3200c0b176806c4d1ef44a1eab2aab5f0a59801748127dc2d2aae7136eb4e50a287fa6caf13d413f5266b6c699126b4ca466 SHA512 ab966edff2f696b7debd2449e289f196cc78e93e70c2017475be209952eaeef372c0e5ed1782437eedb7c10ced11ebc66959cec40802091c9429c9ff5a3164cd
+EBUILD libilbc-2.0.2.ebuild 887 BLAKE2B 823f2b98b090736d98a07eb2ad8e1489d02f12f33de72cfa2749058c499ae71098dfac05b875a02a2d9fac09e33fa6e4009ceac866162a168ff6e5a70156509e SHA512 eb28d8e92974fb0b2367bea26bae5443838f45e84535ce2a1890fccf1ecfbafc661a7baf3bf96bf64e89ee375adde735b3965fc11c4b85aa1cd17e8d31790d90
+EBUILD libilbc-9999.ebuild 832 BLAKE2B 905b3fbac3be812a69d44755949e950c234b84704e95f1527f35df46e162901b7852b74f24fc7de02a9d955da4da42c02c50c3d6e33a68fbf2df8675d493522f SHA512 b95d46ab5544775cd3be4d4a361de4c662df82de9c848499c30d8e1d3c0a302fe4ec491063b77b6a4129f16bdd5b42e713c03647f288f31c5577b21bc58a9061
 MISC metadata.xml 415 BLAKE2B 424981b7c747af54e0658541f8ed279ee5f0a66f3ddf92c62497c185f497341fb3b1a583c4786c6ffe8eea335fd0537802bfcff4567ca5f3c9f2482f0e526748 SHA512 f0be09fd8270ae30e2fc499de10ae5d7416a6ea50a787d6383428b81df8959ee4d18383011aca0d423549919982b6b05faa964c6378d2727d8be5bd82d4417ce
diff --git a/media-libs/libilbc/libilbc-1.1.1.ebuild b/media-libs/libilbc/libilbc-1.1.1.ebuild
deleted file mode 100644
index 69c70d5fafb1..000000000000
--- a/media-libs/libilbc/libilbc-1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-if [[ ${PV} == 9999 ]] ; then
-	SCM="autotools git-2"
-	EGIT_REPO_URI="https://github.com/lu-zero/${PN}.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-inherit eutils multilib ${SCM}
-
-DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
-HOMEPAGE="https://github.com/lu-zero/libilbc https://github.com/TimothyGu/libilbc"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${D}"usr/$(get_libdir) -name '*.la' -delete
-}
diff --git a/media-libs/libilbc/libilbc-2.0.2.ebuild b/media-libs/libilbc/libilbc-2.0.2.ebuild
index 40eb6ee13b72..d01615a69b31 100644
--- a/media-libs/libilbc/libilbc-2.0.2.ebuild
+++ b/media-libs/libilbc/libilbc-2.0.2.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [[ ${PV} == 9999 ]] ; then
-	SCM="autotools git-2"
+inherit multilib-minimal
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 fi
 
-inherit eutils multilib ${SCM} autotools-multilib
-
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
 HOMEPAGE="https://github.com/TimothyGu/libilbc"
 
@@ -21,8 +20,21 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="static-libs"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64_sparc.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64_sparc.patch
+	default
 	[[ ${PV} == *9999 ]] && eautoreconf
-	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild
index a7ac81e5c6d4..1d00bd81c2f7 100644
--- a/media-libs/libilbc/libilbc-9999.ebuild
+++ b/media-libs/libilbc/libilbc-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [[ ${PV} == 9999 ]] ; then
-	SCM="autotools git-2"
+inherit multilib-minimal
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit eutils multilib ${SCM} autotools-multilib
-
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
 HOMEPAGE="https://github.com/TimothyGu/libilbc"
 
@@ -22,6 +21,18 @@ SLOT="0"
 IUSE="static-libs"
 
 src_prepare() {
+	default
 	[[ ${PV} == *9999 ]] && eautoreconf
-	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }