gentoo resync : 25.11.2020

5 files changed, 34 insertions, 40 deletions

diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index d27bb719dd77..b0913fb4dbb7 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,6 +1,7 @@
 AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0c0a3a15b0c2945da0d707d2d1b308c1860d52914b875504c0967c4b75ae42a4f7766611563c150cd0afb0acfe1369cc72116 SHA512 97fa2a52456809b2c4bac66c4c309b0d95a7a12d43eb102857339e729ede84f9a2cef9050a7232090e7b4e2f3817890d94e565051553f4cec3b7e83e69b2481c
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-EBUILD bcg729-1.0.4-r1.ebuild 778 BLAKE2B c7e00edba1061875922a7123ba168a81292fad35ef84dd4a0d5a38b955675646bab11c1beeebb95103cec1a42fe924de936e7794fdb17b280f2625634a9b1f17 SHA512 e5a22040055627394970e8366f6b2c26b48da1f9641ec8f4a348b03fc059abe68bfc82183f021302c858c77351cff28413fb5cd36e09cc275420d05b7c968b01
-EBUILD bcg729-1.0.4.ebuild 665 BLAKE2B 61e259c0e136f52ca45d6676e3c13acfb34d27028140ed2e4a487b8fa589985101679df5f5de4664d565fef354f09a1a66d5ce32ee693a817adedbfa48bb7c03 SHA512 cab46d07da0a5c27c2e3d1362701835b9cc970d01b6a069ca908d6194999706d1e04a44775a1468558d3a3dc3534f26ac63290fa39258e474b86de527676a1eb
-EBUILD bcg729-999999.ebuild 722 BLAKE2B b25c170cab5975861a9b8caae9922efda53869c39a74094a5092be074db3c5b4da37f0fcedeb776ed34a154c5e9dbf74cd796d1eb7fb83ca8eec358fc86d97a7 SHA512 9f3d10de5a4010848e067fc21fcabe64fa0de7797e61521be5c8779e55ae676f7d7fc7c72d54d3d134eb978adeb2fc23b95b7129324bbd77f0a8bc196eab84a9
-MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
+DIST bcg729-1.1.1.tar.gz 122475 BLAKE2B 6774f6af439c9308db856be9d4bbb6db5c73e7a807b51dca6338d1506d896052a7830ade7767b45fd5a9ded0a6a0057e207bc1d5b0e33adbaed9dafb13a7bd3b SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8
+EBUILD bcg729-1.0.4-r1.ebuild 773 BLAKE2B 6d4bbbd387848015bff76c14c53c584f57b25061682edb2e7f39154bf6473f840badb8536f602b7e19bdf81701944b818ef8df9bdec541613adb3b7d4ee8b6f8 SHA512 5a10a6452874531186ddd133ace537037b0e6df4203cb283cc77f6603c08c2be3a182cc75a83232e38b24474c8fd6996526fd1ee5cbddebf74156766ed914480
+EBUILD bcg729-1.1.1.ebuild 698 BLAKE2B cbe4ebced262e909cff565d1fbb85a9a76f5ff195ed620a097db389ea46eef689420eeeeee6b894dc8ec511d4e425ebbed699fad90d70d46c49f008487fe80cc SHA512 0c7655f48fd72fec94ff20588d27448a048b48606c9758dbe71aee203f4425767586eecb9e796b76cf746db2acf82bb39e24152962c366c2ff6a207194a608d0
+EBUILD bcg729-999999.ebuild 576 BLAKE2B 5fe0f10f4483e5873833fd05f8927622a63241f30f57f74606c553b664177f97ee84e287132ab0aff17bb315dcfe1ab1893d4f670163a6c7e8977ccbc9493e7b SHA512 bfde637d4a43ecdf4668188d0a2b6fc71a0a68cc7825fb260cc6034773b3e8a724411afba89bb7a6e74442f40370fc0f1cdfbd9eae9c2e45180bf70a286d9239
+MISC metadata.xml 318 BLAKE2B f7971ede10d80284559e2a3a9dc9088ff06c588d993f1b0dbcb13667a10495d0390a4ebe2c4e65b8fca8d7369c8600e7f446beb280ce04ef66debf52c0f26ba0 SHA512 b2cd9ed908992ad45a31d4f15954385f5d9bfd7f4659330695aaab3b7d1d1dcac1ed56680c77ab786ea7454b8032fb70332cdd06a74f2e40c3162bdb6d4a0a31
diff --git a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
index 81359d7dde91..ce3201c782e7 100644
--- a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/bcg729/bcg729-1.0.4.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild
index 10929658ed04..4ff2047c3db0 100644
--- a/media-libs/bcg729/bcg729-1.0.4.ebuild
+++ b/media-libs/bcg729/bcg729-1.1.1.ebuild
@@ -1,32 +1,30 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools ltprune
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV}.tar.gz \
+SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.tar.gz \
 		-> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc64 x86"
-IUSE="static-libs"
-RDEPEND="
-	!media-plugins/mediastreamer-bcg729
-"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
-src_prepare() {
-	default
-	eautoreconf
-}
+RDEPEND="!media-plugins/mediastreamer-bcg729"
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	local mycmakeargs=(
+		-DENABLE_STATIC=no
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	default
-	prune_libtool_files
+	cmake_src_install
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/bcg729/bcg729-999999.ebuild b/media-libs/bcg729/bcg729-999999.ebuild
index 4155676ac3c2..5263aff5d73a 100644
--- a/media-libs/bcg729/bcg729-999999.ebuild
+++ b/media-libs/bcg729/bcg729-999999.ebuild
@@ -1,33 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils git-r3
+
+inherit cmake git-r3
 
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
 EGIT_REPO_URI="https://github.com/BelledonneCommunications/bcg729"
+S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-RDEPEND="
-	!media-plugins/mediastreamer-bcg729
-"
-S=${WORKDIR}/${P/_/-}
+RDEPEND="!media-plugins/mediastreamer-bcg729"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.0_beta-cmake-build.patch
 )
 
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_STATIC=$(usex static-libs)
-	)
-	cmake-utils_src_configure
-}
-
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/bcg729/metadata.xml b/media-libs/bcg729/metadata.xml
index 825589988b40..5fb0304da7e2 100644
--- a/media-libs/bcg729/metadata.xml
+++ b/media-libs/bcg729/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>