gentoo resync : 02.03.2018

4 files changed, 40 insertions, 15 deletions

diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 2506787d65a1..51d2b8fca655 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,6 +1,7 @@
-AUX ecasound-2.8.1-ldflags.patch 2715 BLAKE2B 22621e1ef4abd7b0f0fdb0cc5046f8dbe8c0f1c0ab32b2f04a41777ac96bfcd3f514a92a343f0fd720364c399f84164918fa24f3b7f0a6cf7d5368916fb4e766 SHA512 2cf1d68b04c651480fdabb04e6e68c2d52d05405ea3c4813aa12cdca1c7fca8f80aa524d7424b98d4cf376cfabe372766a2fc2e5f564f8eff0125c7c4ad06d1b
+AUX ecasound-2.8.1-ldflags.patch 2560 BLAKE2B 04c7c17b44385839a3b9dd5da0bad9306fd2e3029f74772be1d7792255cbfac36e8618c2b2880a45d72b1d57ea69040f1081f7a078a231efe285abef5cdbb3c0 SHA512 b5ecf1fc1de2e9f3087b2994f93841592e381bb38edfea33344e171cccdb9cdd70c010c2194e65eb6ef34d11b76f0a709efd175b44c7da65ff36bfeabf3d2c29
+AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54
 DIST ecasound-2.6.0.tar.gz 966629 BLAKE2B 35539d80ea306f2ba38980838895c66a2f5db918854f0bd0d0cd1513d0cdaa00a9359337b469a41b8fa42cd88e7642e8393d91fdb1add277edfe77bde633e1cc SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e
 DIST ecasound-2.9.1.tar.gz 1057333 BLAKE2B 37e337d379ef649877278a4a3736ef98cde57aeee5a547d3a8e3b9d81785a8a33c964680a6b6871a26d097520f7eab20b186291698869014ec9a12c2ced49b28 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033
 EBUILD ecasound-2.6.0-r1.ebuild 1724 BLAKE2B 66e48a09caffbc34571c79ba51c185a9eff167ffe138bb2b12c9ee7e874d9dcf92ad420d070ef982f5763bc3617f684d7729b736242464a88c7688b4e8a68c49 SHA512 3ac59b9ebff9cfd07473258c5489363a4b34a3c957f9af1fd9adbed3d72d1e620f72b06886ce5bbf7a9030cd921c939ceb4a3c01774774119a48f34f5dd0cc30
-EBUILD ecasound-2.9.1-r1.ebuild 2278 BLAKE2B 56f17b8378ba04b7fb51029fff888064cf6c5fe30cf2d88a3a8962ff99d231a8c665d52255957535c759c37fe0fdf550f6e7bdffcbad89c7b89a76aea815118b SHA512 a8fa902eecb44188e5cd0f12505c1cdd19f257b28af3b6308652217b6839343537c372a2d16ac4aecad4fd225879c84018ce9868bac72bf66b15a04ea013c79f
+EBUILD ecasound-2.9.1-r1.ebuild 2318 BLAKE2B ada746c2b6a2e544a9fd3638659b6da4b285894c4dd5ebecb00860b37b34280f4068830ef37c32874422615c055861c67bb0aec749b7e3a1c54cff910f8cdd92 SHA512 4ac154c8d5b2dec60d8516f358f1c2bd2fd250b12dbb8b8049f6c615ab3bfe5dfef7bcbdf52b0dc03c145ad8898957d802b419a3a22f02275ca69faf9510b904
 MISC metadata.xml 991 BLAKE2B 5730449cc175d580ae46d63a1a463ee8f417dfeab0fcc305903cc511020a2f24b2313ae09cb89d0f627789837a80ad2754b900ceb2e1a9a8ded661bf00f3ce4d SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c
diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
index 5485c1404a08..52575e945b5c 100644
--- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,14 +34,17 @@ RDEPEND="sys-libs/readline:0=
 	sndfile? ( media-libs/libsndfile:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.1-ldflags.patch
+	"${FILESDIR}"/${PN}-2.9.1-tinfo.patch
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-2.8.1-ldflags.patch
-	eapply_user
+	default
 
 #	if use python ; then
 #		sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
diff --git a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
index 8dca486f06e1..162e0224e6e4 100644
--- a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
+++ b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
@@ -1,5 +1,5 @@
---- ecasound-2.8.1.orig/kvutils/Makefile.am
-+++ ecasound-2.8.1/kvutils/Makefile.am
+--- a/kvutils/Makefile.am
++++ b/kvutils/Makefile.am
 @@ -56,13 +56,12 @@
  			kvu_value_queue.h
  
@@ -15,8 +15,8 @@
  libkvutils_tester_LDADD = $(lib_LTLIBRARIES)
  
  noinst_HEADERS = $(kvutil_headers)
---- ecasound-2.8.1.orig/libecasound/Makefile.am
-+++ ecasound-2.8.1/libecasound/Makefile.am
+--- a/libecasound/Makefile.am
++++ b/libecasound/Makefile.am
 @@ -364,7 +364,7 @@
  
  libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
@@ -26,8 +26,8 @@
  libecasound_la_LIBADD = $(eca_libadd)
  libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
  libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
---- ecasound-2.8.1.orig/libecasound/plugins/Makefile.am
-+++ ecasound-2.8.1/libecasound/plugins/Makefile.am
+--- a/libecasound/plugins/Makefile.am
++++ b/libecasound/plugins/Makefile.am
 @@ -105,7 +105,7 @@
  libecasound_plugins_la_SOURCES          = audioio_dummy.cpp $(plugin_cond_sources)
  EXTRA_libecasound_plugins_la_SOURCES    = $(plugin_all_sources)
@@ -37,8 +37,8 @@
  
  libecasound_plugins_debug_la_SOURCES	= $(libecasound_plugins_la_SOURCES)
  EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
---- ecasound-2.8.1.orig/libecasoundc/Makefile.am
-+++ ecasound-2.8.1/libecasoundc/Makefile.am
+--- a/libecasoundc/Makefile.am
++++ b/libecasoundc/Makefile.am
 @@ -14,9 +14,9 @@
  # !!!
  # remember to update eca-version.cpp
@@ -51,8 +51,8 @@
  endif
  
  INCLUDES = -I$(srcdir)
---- ecasound-2.8.1.orig/pyecasound/Makefile.am
-+++ ecasound-2.8.1/pyecasound/Makefile.am
+--- a/pyecasound/Makefile.am
++++ b/pyecasound/Makefile.am
 @@ -28,7 +28,7 @@
  				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py
  endif
diff --git a/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch b/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch
new file mode 100644
index 000000000000..c4953420b18c
--- /dev/null
+++ b/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -810,7 +810,9 @@
+ dnl switch to C for testing
+ AC_LANG_C
+ 
+-AC_CHECK_LIB(ncurses, main, termcap_library=ncurses,
++AC_CHECK_LIB(ncurses, main,
++	[termcap_library=ncurses]
++	AC_SEARCH_LIBS(tigetstr, tinfo),
+ 	AC_CHECK_LIB(termcap, main, termcap_library=termcap,
+ 		termcap_library=none))
+ 
+@@ -821,6 +823,7 @@
+ 	        y | yes)
+ 		  AC_MSG_RESULT(yes)
+ 		  termcap_library=ncurses
++
+ 		;;
+ 
+ 		n | no)