gentoo resync : 08.01.2021

3 files changed, 8 insertions, 43 deletions

diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 946fb4097476..08900880ac70 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,7 +1,5 @@
 AUX codec2-0.8.1-fno-common.patch 269 BLAKE2B 181d25b915a6dfc21450004e0da53a41888a04210dc944ec58adf8bab40b0216bb8a98c56f8cfcb74c88d91b18916ac05886c3471da92525d6c4bdba3789e55c SHA512 c3d691159dda7d9d398e182dc233302adddc3c21f2a2d1a92934c660021357d5378c7e17c4cae48573fc94f180d9ce5732b36e76363a74f738c9916d12b7f1b8
 AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
-DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
 DIST codec2-0.9.2.tar.gz 12244006 BLAKE2B b7fdff34e41f93f237235db5cf1352e7165565ae13bc88cfe41bc6eb280e16f49c71f6b9947ced81612b0fa6b2630a9f2f75fe257ff09bae5eef1a0b6b39c95b SHA512 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
-EBUILD codec2-0.8.1.ebuild 711 BLAKE2B 0543fbc52ec2fe37b522de9941a6c29096b957dc0b306920c5d295f63f61b63bfd26b94bff62ee3ba916a2a97f3b01eba2e3f8a380a576e70b9f16cd61aae221 SHA512 20c3c9279ab95fade8ee985530a1ad5c6d82afdda375e02f4641cdf89cd810c34cfe45aa42bfd6bc85d54ff9d04ffacc35dcd3a5c243be7cfad69213ab868e66
-EBUILD codec2-0.9.2.ebuild 592 BLAKE2B c44ddecf5520c55cd79d0c9bd805d305774d7f967cc5c850cdb11bfbd79bb49c4e83c6b11146de9e44b732b20271ac99fdefb6fb575860374444accfaf84c1c3 SHA512 71118b635fcab2c31f99659cfc1b251f605da240502f25618a812f30b5bd81791e6c3c47c0af5da107547770a772a0abb1d87fb15854d729e60a1a894fc38d7c
+EBUILD codec2-0.9.2-r1.ebuild 671 BLAKE2B 526e1c54cc71b7f1700ea74d7bd6e9b922cb565d878f78bbafa73f97f6f63f798c53d9ca9d33000a9b82bebdcc1a6adc99d7bd0600f484da5025ce1d6726b74f SHA512 76b3231baf3f12383ece2889a7fdf22f2207329fe465b0bc3a47d848bfabb1a5a10e33788c04443406ffe146a464f2a2aa095370d7490f483ae6051cdccfc297
 MISC metadata.xml 325 BLAKE2B 8895125c208d04f4583087f7d5d6bcf5fb84db2800feb33ec8f0370ea2eabd36bbbf4914df33bb7d580fb966af35873bb39633d7248d9d69d48b8968a8f7776c SHA512 427760a65fe9d84a527287e815ff6e4f783bbb5ebf28fd52c225721c649eaab738edf090a6af72547b57e2c1a80fd616d8af1a2af931398819de748c4306c0b7
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
deleted file mode 100644
index 8dbf9acea974..000000000000
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/"
-SRC_URI="https://hobbes1069.fedorapeople.org/freetel/codec2/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="examples"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unused-deps.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=( -DUNITTEST=OFF )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	if use examples; then
-		insinto /usr/share/codec2
-		doins -r wav raw
-	fi
-}
diff --git a/media-libs/codec2/codec2-0.9.2.ebuild b/media-libs/codec2/codec2-0.9.2-r1.ebuild
index f48bd59ad5dd..6d15dce3533d 100644
--- a/media-libs/codec2/codec2-0.9.2.ebuild
+++ b/media-libs/codec2/codec2-0.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,13 +11,15 @@ HOMEPAGE="https://freedv.org/ http://www.rowetel.com/?page_id=452"
 SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
+SLOT="0/0.9"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="examples test"
+# Not yet passing, but infrastructure added to run
+RESTRICT="test"
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DUNITTEST=OFF
+		-DUNITTEST=$(usex test)
 		-DINSTALL_EXAMPLES=$(usex examples)
 	)
 	cmake_src_configure