gentoo resync : 15.12.2019

5 files changed, 63 insertions, 7 deletions

diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index afeabf438516..d11b901985e6 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,4 +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.ebuild 623 BLAKE2B e5933d4aa23c3898a13d050cd61bd2ca0452692bc029f9ade00abb8c70767e0e25a9f72d8ab8ea5df3867d0670272952263419de25c5f81ab8c8540920635651 SHA512 950ea02042115a4654841cb217d0615fb05d2d272f518d5ce6f0af6ad7874d30a1caa286516e02e13fc3b78a236fd170ec3b15cf7c2abcf700d55b2f04a0efad
-EBUILD bcg729-999999.ebuild 532 BLAKE2B 5c5477ece2be46fd1c9460317253f40be5898b7d736e722a4b9298c1e0c440c8ec5736ec136135e8a959ede7f9b5a042f5b0fa48b44fc910f7031c88747f4ec1 SHA512 87d0caa1f5a310d7eb22400437ce527fefce9893ee8c31c3d92b650e0dbb19eb3ff5e2d663e0c214199dc27f2419c3fee59e3a76e9073ff407d10d8b6e2fe910
+DIST bcg729-4.3.0_alpha.tar.gz 121783 BLAKE2B 10d34fcea3eae131cefc8133f092e4e74f5c8df244bc343fe5d73a49167c6d6ec506845d6cb29cac1fb111c1a68bcc1b60d011aa635923138fea6bec5d342594 SHA512 326a76ff32086c1cb70c0327153f04bfcb82f5fb6767668a713f2517cf4b130f23563db3c6c9b4cd33b1514ce829356120d2ebd9208291da277a9a09263764fe
+EBUILD bcg729-1.0.4.ebuild 666 BLAKE2B 0bbddcfe3e7f90118742640a61da666a75d50295fb487af348e3ec772bd310d9652d05d516dad59911c49bc039f88bc535bb21795019663881e5980d59ff47af SHA512 c94709c6b22b23a2421ec547ad8c447e12012558f89a7aca98a568b4fb0b47db7c1e460b9177ccedc24ea09d6518aaf768de9cbc35ebc1b51f3e0a96c87db4bb
+EBUILD bcg729-4.3.0_alpha.ebuild 791 BLAKE2B ea1912ae4149b29f8ebb5f472b42f7f6a347323c7a5f42b4eac412ec53935eb9ace388e22f53f0e59143ea1514821baf649b2dfd8b743eee4a575112d0c8859c SHA512 5cb2703428b853633f87762f22d63fbd0b1a51b338865e9565e6eea96ff80da36674315932fb402f95cbb68e02020ee4599127d71144475b897d8a077e73ec1a
+EBUILD bcg729-999999.ebuild 722 BLAKE2B b25c170cab5975861a9b8caae9922efda53869c39a74094a5092be074db3c5b4da37f0fcedeb776ed34a154c5e9dbf74cd796d1eb7fb83ca8eec358fc86d97a7 SHA512 9f3d10de5a4010848e067fc21fcabe64fa0de7797e61521be5c8779e55ae676f7d7fc7c72d54d3d134eb978adeb2fc23b95b7129324bbd77f0a8bc196eab84a9
 MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/media-libs/bcg729/bcg729-1.0.4.ebuild b/media-libs/bcg729/bcg729-1.0.4.ebuild
index 6d177a36f30e..4701c38eafb3 100644
--- a/media-libs/bcg729/bcg729-1.0.4.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4.ebuild
@@ -6,7 +6,8 @@ inherit autotools ltprune
 
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV}.tar.gz \
+		-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-libs/bcg729/bcg729-4.3.0_alpha.ebuild b/media-libs/bcg729/bcg729-4.3.0_alpha.ebuild
new file mode 100644
index 000000000000..0af9054bbb8e
--- /dev/null
+++ b/media-libs/bcg729/bcg729-4.3.0_alpha.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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 \
+		-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="static-libs"
+RDEPEND="
+	!media-plugins/mediastreamer-bcg729
+"
+S=${WORKDIR}/${P/_/-}
+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
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/bcg729/bcg729-999999.ebuild b/media-libs/bcg729/bcg729-999999.ebuild
index 961164ae6e95..4155676ac3c2 100644
--- a/media-libs/bcg729/bcg729-999999.ebuild
+++ b/media-libs/bcg729/bcg729-999999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 cmake-multilib
+inherit cmake-utils git-r3
 
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/BelledonneCommunications/bcg729"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -15,10 +15,19 @@ IUSE="static-libs"
 RDEPEND="
 	!media-plugins/mediastreamer-bcg729
 "
+S=${WORKDIR}/${P/_/-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0_beta-cmake-build.patch
+)
 
-multilib_src_configure() {
-	local mycmakeargs+=(
+src_configure() {
+	mycmakeargs=(
 		-DENABLE_STATIC=$(usex static-libs)
 	)
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch b/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch
new file mode 100644
index 000000000000..9efcf0fabe8c
--- /dev/null
+++ b/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -119,5 +119,3 @@
+ 	DESTINATION ${CONFIG_PACKAGE_LOCATION}
+ )
+ 
+-add_subdirectory(build)
+-