gentoo resync : 02.06.2019

4 files changed, 84 insertions, 30 deletions

diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 935fd70c0c7b..407253b24e62 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,4 @@
-DIST codec2-0.7.tar.xz 8386048 BLAKE2B 04e2ab834539d6911300d30a7de00a0c351e29c53972482765cbefefe8d9e0f10b491496690e34beacce27f68da0c85bb6ad8bb75b93ce50e44eb13f1ad8070b SHA512 bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af
+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
-EBUILD codec2-0.7.ebuild 485 BLAKE2B 06f9744dbf2dd9eeb47bebfb09662526253ac62e3d34b47390b9b4df147721b6b7aeb51a67c9a5495474e133a4fc27465736ff50c4a9043e3be8e3ff8c834357 SHA512 39da503a4cfd811cd0de69e775b38cd16a1e41cf97342df493f09597efbd225a06e2f56836e9641367d67c5005da67e4c89bb5ee5052b1605117226b251d8b89
-EBUILD codec2-0.8.1.ebuild 638 BLAKE2B 0c90251cba1a1b918d92dc44a7988980b94b21f17132c98020412ea18494d8632d233ee246d89149810f1c5f64ab00ad44b3c444454835b19f0cd084b9b6e558 SHA512 a624acdd621265c64afc95a1dd1215a117b396b0e4ded70b92ba0f276944de3402f9744fa9f2283871be0f6a9ab8762fefb40ad6a2ba9b293588d16587ba0a28
+EBUILD codec2-0.8.1.ebuild 657 BLAKE2B 068d47df535a6094365c8be35bee0c672b7e6203350f209ec2ddefe9efa8bfed26fe541e1a73c07bfcd2d93fc02531b0b4b825f47a5f8a14881317806c7fc39e SHA512 9aa724b393f39ab66e3157323957eadaf38b852ff4c8901d33ff037467c8e2667fba2074e1144078fe2c1cfe57bb855f4b5731ba344145db0aa81c4ee359a5d9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.7.ebuild b/media-libs/codec2/codec2-0.7.ebuild
deleted file mode 100644
index c50c30e8bd4c..000000000000
--- a/media-libs/codec2/codec2-0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/"
-SRC_URI="https://freedv.com/wp-content/uploads/sites/8/2017/10/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=( -DUNITTEST=OFF )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index f220838eef34..78da953304a8 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
 
 multilib_src_configure() {
 	local mycmakeargs=( -DUNITTEST=OFF )
diff --git a/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
new file mode 100644
index 000000000000..174e5173aa66
--- /dev/null
+++ b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
@@ -0,0 +1,79 @@
+From 3f786481d49e25a089586df4656cab563c90ae41 Mon Sep 17 00:00:00 2001
+From: David <david@rowetel.com>
+Date: Thu, 25 Apr 2019 06:47:06 +0930
+Subject: [PATCH] removed unneeded dependancy on libspeex and libsamplerate,
+ these were just used for random misc programs
+
+---
+ CMakeLists.txt      | 30 ------------------------------
+ unittest/CMakeLists.txt |  9 ---------
+ 2 files changed, 8 insertions(+), 48 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 669b8be1..6c8eae19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,36 +195,6 @@ if(UNITTEST)
+     find_package(Threads REQUIRED)
+     message(STATUS "Threads library flags: ${CMAKE_THREAD_LIBS_INIT}")
+ 
+-    #
+-    # Find speex library
+-    #
+-    message(STATUS "Looking for Speex DSP library.")
+-    find_path(SPEEXDSP_INCLUDE_DIR speex/speex_preprocess.h)
+-    find_library(SPEEXDSP_LIBRARY speexdsp)
+-    message(STATUS "  Speex DSP headers: ${SPEEXDSP_INCLUDE_DIR}")
+-    message(STATUS "  Speex DSP library: ${SPEEXDSP_LIBRARY}")
+-    if(NOT SPEEXDSP_INCLUDE_DIR AND NOT SPEEXDSP_LIBRARY)
+-        message(FATAL_ERROR "Speex DSP library not found!")
+-    endif()
+-
+-    #
+-    # Samplerate Library
+-    #
+-    message(STATUS "Looking for samplerate...")
+-    find_library(LIBSAMPLERATE samplerate)
+-    find_path(LIBSAMPLERATE_INCLUDE_DIR samplerate.h)
+-    message(STATUS "  samplerate headers: ${LIBSAMPLERATE_INCLUDE_DIR}")
+-    message(STATUS "  samplerate library: ${LIBSAMPLERATE}")
+-    if(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-        list(APPEND FREEDV_LINK_LIBS ${CMAKE_REQUIRED_LIBRARIES})
+-        include_directories(${LIBSAMPLERATE_INCLUDE_DIR})
+-    else(LIBSTAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-        message(FATAL_ERROR "samplerate library not found.
+-On Linux systems try installing:
+-    samplerate-devel  (RPM based systems)
+-    libsamplerate-dev (DEB based systems)")
+-    endif(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-
+     add_subdirectory(unittest)
+     add_subdirectory(misc)
+ endif(UNITTEST)
+diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
+index 35a944fe..9b2e0e95 100644
+--- a/unittest/CMakeLists.txt
++++ b/unittest/CMakeLists.txt
+@@ -73,12 +73,6 @@
+ add_executable(tfifo tfifo.c ../src/fifo.c)
+ target_link_libraries(tfifo codec2 ${CMAKE_THREAD_LIBS_INIT})
+ 
+-add_executable(speexnoisesup speexnoisesup.c)
+-target_link_libraries(speexnoisesup ${SPEEXDSP_LIBRARY})
+-set_target_properties(speexnoisesup
+-    PROPERTIES INCLUDE_DIRECTORIES ${SPEEXDSP_INCLUDE_DIR}
+-)
+-
+ add_executable(fdmdv_mem fdmdv_mem.c)
+ 
+ add_executable(raw2h raw2h.c)
+@@ -91,9 +85,6 @@
+ add_executable(tnewamp1 tnewamp1.c ../src/quantise.c ../src/newamp1.c ../src/mbest.c ../src/kiss_fft.c ../src/sine.c ../src/nlp.c ../src/dump.c ../src/octave.c ${CODEBOOKS})
+ target_link_libraries(tnewamp1 codec2)
+ 
+-add_executable(tsrc tsrc.c)
+-target_link_libraries(tsrc samplerate)
+-
+ add_executable(tlininterp tlininterp.c)
+ add_executable(tdec tdec.c)
+