gentoo resync : 22.06.2019

4 files changed, 49 insertions, 93 deletions

diff --git a/media-libs/vo-amrwbenc/Manifest b/media-libs/vo-amrwbenc/Manifest
index 056bcc9a79d6..b792823c2cc8 100644
--- a/media-libs/vo-amrwbenc/Manifest
+++ b/media-libs/vo-amrwbenc/Manifest
@@ -1,6 +1,4 @@
-DIST vo-amrwbenc-0.1.2.tar.gz 598415 BLAKE2B b21a66010f17a6d9e55fc039e05f8ac8c35eebaada011447fbfb9710be8e82e8a10c21f16a5f0e91053c84211c85541556a9a324e928e1d1dada6c4b2b4ea70c SHA512 54be9c63d1b4c66e56dbf85cef2924c4cc564556186692182b44f199a5f72eba02c619b8cfa89f33b88add149fded81a42a392a9b96b6274ad0ad6c1f929a61b
 DIST vo-amrwbenc-0.1.3.tar.gz 608936 BLAKE2B 7283ef12c40e25d768d9d0be6cede6a514fc881cd67185700c0afe4e03c97c660d74f28fccbad436b4067ec07be574c10b73f00a162195697714ffe0c127b168 SHA512 5f132f798f00ec2c0619700ab1ce456897792b45631af4b538c866636af9c9de5600af5f79040c41c3dc69c17cf4be7032139a9518a46a4276431e091f3dd6a9
-EBUILD vo-amrwbenc-0.1.2-r1.ebuild 991 BLAKE2B 7c7430468a768527049bc8c3fcb2a1cd98e247d77b47421e907c8dfcfc1fcc895c9fa66555697848cb4c30ea33553890ee357cf6fc8375302ad8e50a95c65dcd SHA512 0790d8615adad6b0c9d37f2250ae0a3527bb98fe020e4832b7f643750a6c6dcac6aa225ef0163e8a4033ac9642c3f59133ba9662cd441411337ab33dbcec6e1d
-EBUILD vo-amrwbenc-0.1.3.ebuild 993 BLAKE2B 5a51dd122b095687fba94b1ef80a2c8e65737713d63cee5d81a1dc08023ac3c8c513d2870cdd9d3a746a85a08c44a4c84f451910036bd545e97a696923cf909c SHA512 cdcda9754f2a46e315ee3f86a0696c8e49ef3e40f476ac999f1be03e7d779be324e0da655889ca2b576a8c80c7cb287441c40cec92f0c5aad079742fff4272bf
-EBUILD vo-amrwbenc-9999.ebuild 1006 BLAKE2B 5d3c9d3c0b3eda1b7c4940d8623833c3ed5c213f3cecd3092664aa3e59a8ed9b87b9f04c5580390e16a59d9d9d3f09ec6ed9cad930b5ca72c840b42285f7d010 SHA512 b460a7d925760fdda6e41aa661ba83f9b251de10ec1496b60f77301c074e521544b8feeb548ee18529588cc9e79882fd0a4f02cfb4fc8b479d7f9ddb9cf1e854
+EBUILD vo-amrwbenc-0.1.3.ebuild 894 BLAKE2B 38ebb6f83f28c2948d2834a433f94c710c43823a0f1e74028c150fb0122d162ba7fcb0434c440da57ea07ca151f74db62023db045af7e84777856738f40ba3bc SHA512 0c58a5944c291cf572ffeecfc2d784451582b94b621753778ff13096b29bfba2ed367e21dd70687d81ad3d57b4e7a239a72112b842e6649af7f57d07d565aac1
+EBUILD vo-amrwbenc-9999.ebuild 904 BLAKE2B 1acaa6608bb7f467ef75d3153c1373d768db1e485fd1277bb7aeb56f231ea73663eefdedb7063146295765b98d2896760817f0c537909ae8ce9fad842f94a6a1 SHA512 8925e0f3e7e919e4479dbb63b980dc32dd264d06391a75fd982bf33225789cf182cb0e24b2e374bc0882fec9a64c2691d1cb2d77f2dd9386fc4367e164096d42
 MISC metadata.xml 648 BLAKE2B e51d5f1ea7ae926d6e085eeebf7cf066dff76eba5e8ff611382093b25055f119f903eb7c8a91c28d04ecdb389a571072d8cfe6e2a456c243ec896c7bec877136 SHA512 db2c18bbf40481d5a3b2582ab07e0ace0538f629fabeff219f77a875a27ca6387884e5c3c8fc49916a11e53224b85f7fed28f4b8ec7921a0db15ee7cbd5ce951
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2-r1.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2-r1.ebuild
deleted file mode 100644
index c084e7fe5838..000000000000
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="VisualOn AMR-WB encoder 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="Apache-2.0"
-SLOT="0"
-
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE="examples static-libs"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable examples example) \
-	)
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
index 27f2a1bdd839..12491d041120 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
@@ -1,40 +1,39 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+inherit multilib-minimal
 
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	AUTOTOOLS_AUTORECONF=1
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/mstorsjo/vo-amrwbenc.git"
+else
+	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 fi
 
-inherit autotools-multilib ${SCM}
-
 DESCRIPTION="VisualOn AMR-WB encoder 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="Apache-2.0"
 SLOT="0"
-
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="examples static-libs"
 
-src_configure() {
-	local myeconfargs=(
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable examples example) \
-	)
-	autotools-multilib_src_configure
+		$(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/vo-amrwbenc/vo-amrwbenc-9999.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
index 725ea1c33f0b..0e3e35eee5ff 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
@@ -1,40 +1,39 @@
-# 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
 
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+inherit multilib-minimal
 
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	AUTOTOOLS_AUTORECONF=1
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/mstorsjo/vo-amrwbenc.git"
+else
+	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 fi
 
-inherit autotools-multilib ${SCM}
-
 DESCRIPTION="VisualOn AMR-WB encoder 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="Apache-2.0"
 SLOT="0"
-
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="examples static-libs"
 
-src_configure() {
-	local myeconfargs=(
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable examples example) \
-	)
-	autotools-multilib_src_configure
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }