gentoo new year resync : 01.01.2021

4 files changed, 63 insertions, 23 deletions

diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index abeb75eb88f4..8b1bab1566a8 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,5 +1,8 @@
 AUX libilbc-2.0.2-ppc_ppc64_sparc.patch 933 BLAKE2B 90bb615cb33dfb1eae9d276b08df85ed37b47f127fe9e88a983120d25c57cf669ed0e166d63b3b51e5ac29701107b9be9b683bb36b3e868177bdb2efb1b22e88 SHA512 6a468dff6c42d2e0628466cb9c71639052a17640c78134ee98634c473e4da60296b86eec8f8b8214f64d298d80587dcd03722a9cfc2e588efb73f72f4954eba1
+AUX libilbc-3.0.4-respect-CFLAGS.patch 1217 BLAKE2B 69e46ed5ee1f9ef082b54b6049d078dfa3a007d63b8d0a79c1f07dd8335eaa0402dcc08bc30c0bf8c9329b1244d638231c10fa46396a9c07cdcdab8539fa6c5a SHA512 7de1bb74f552dadccbe3a31c4a2cef7da7525fae47dc7e5d22c78e59604ac9e07e3f4123acc35e174dcf9fe25f4c7e3b6e51a092f77c4f604b23af1ed724cf4a
 DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
+DIST libilbc-3.0.4.tar.gz 1307591 BLAKE2B a914b79c1134536f45910d367216b1ac27d4acb08f4c9b9dd3f01eaf181ecf0f6dc351b944039b05445217360a7e4b868b3aba9f8d6265eeee62a90ce0641a42 SHA512 2239a915263c2a73d83836354d42c670e4fe1173a38b3d1a9cef169778038ae5f4901d8202d6c5367d00db76e034e72bcdf6ac81bf0188f6a3f928e7d36d5a31
 EBUILD libilbc-2.0.2.ebuild 887 BLAKE2B 823f2b98b090736d98a07eb2ad8e1489d02f12f33de72cfa2749058c499ae71098dfac05b875a02a2d9fac09e33fa6e4009ceac866162a168ff6e5a70156509e SHA512 eb28d8e92974fb0b2367bea26bae5443838f45e84535ce2a1890fccf1ecfbafc661a7baf3bf96bf64e89ee375adde735b3965fc11c4b85aa1cd17e8d31790d90
-EBUILD libilbc-9999.ebuild 832 BLAKE2B 905b3fbac3be812a69d44755949e950c234b84704e95f1527f35df46e162901b7852b74f24fc7de02a9d955da4da42c02c50c3d6e33a68fbf2df8675d493522f SHA512 b95d46ab5544775cd3be4d4a361de4c662df82de9c848499c30d8e1d3c0a302fe4ec491063b77b6a4129f16bdd5b42e713c03647f288f31c5577b21bc58a9061
+EBUILD libilbc-3.0.4.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
+EBUILD libilbc-9999.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
 MISC metadata.xml 333 BLAKE2B b0f35100492df931d4a504ea070e7c5df977bb452e013cdbcb6b82d949b42d9b751862c5b9462b67d3669bc401f843eef664e5e1612400cb9418f22b208b2f3a SHA512 9081154d8e099e7b355ef3b11a49e7580bf1ef2a62dfe3f183694041a0a1ef247a111a982af1ba9cefb3a64dc26a4b0edd45b374087e4bbf044f468eff7195ec
diff --git a/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch b/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch
new file mode 100644
index 000000000000..feb3a2255e10
--- /dev/null
+++ b/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cda8105..b766ec2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,15 +52,15 @@ set(CMAKE_CXX_STANDARD 14)
+ 
+ if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"))
+-    set(CMAKE_C_FLAGS "-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing")
+-    set(CMAKE_C_FLAGS_DEBUG "-g")
+-    set(CMAKE_C_FLAGS_RELEASE "-O2")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing")
++    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS}")
++    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
+ endif()
+ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"))
+     set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing")
+-    set(CMAKE_CXX_FLAGS_DEBUG "-g")
+-    set(CMAKE_CXX_FLAGS_RELEASE "-O2")
++    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS}")
++    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
+ endif()
+ 
+ if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
diff --git a/media-libs/libilbc/libilbc-3.0.4.ebuild b/media-libs/libilbc/libilbc-3.0.4.ebuild
new file mode 100644
index 000000000000..9f2f31bf171f
--- /dev/null
+++ b/media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
+else
+	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
+HOMEPAGE="https://github.com/TimothyGu/libilbc"
+
+LICENSE="BSD"
+SLOT="0/3"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-respect-CFLAGS.patch"
+)
diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild
index 1d00bd81c2f7..9f2f31bf171f 100644
--- a/media-libs/libilbc/libilbc-9999.ebuild
+++ b/media-libs/libilbc/libilbc-9999.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib-minimal
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
 else
-	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
@@ -17,22 +18,8 @@ DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
 HOMEPAGE="https://github.com/TimothyGu/libilbc"
 
 LICENSE="BSD"
-SLOT="0"
-IUSE="static-libs"
+SLOT="0/3"
 
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-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
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-respect-CFLAGS.patch"
+)