gentoo resync : 02.09.2020

4 files changed, 2 insertions, 166 deletions

diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 8bcdcb0345e7..d78afc718a75 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,10 +1,7 @@
-AUX ecasound-2.8.1-ldflags.patch 2560 BLAKE2B 04c7c17b44385839a3b9dd5da0bad9306fd2e3029f74772be1d7792255cbfac36e8618c2b2880a45d72b1d57ea69040f1081f7a078a231efe285abef5cdbb3c0 SHA512 b5ecf1fc1de2e9f3087b2994f93841592e381bb38edfea33344e171cccdb9cdd70c010c2194e65eb6ef34d11b76f0a709efd175b44c7da65ff36bfeabf3d2c29
 AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54
 AUX ecasound-2.9.3-ldflags.patch 2718 BLAKE2B c37cfbe326e7219d97286ce1c298af6d5eb21989f986a80f58cc7fef8392f169757395cb0e72f3dce2221e9fe128856b252279d4ba85a77218264faad2053c86 SHA512 2f27fbb2ebfc85ecd91333e17a24964409471f791bed1f4f94210b13277bc836969d4d7f9ff3f70791f72fe32edb2ffa04a07ebbb2528be92ef33624861e39ee
 DIST ecasound-2.6.0.tar.gz 966629 BLAKE2B 35539d80ea306f2ba38980838895c66a2f5db918854f0bd0d0cd1513d0cdaa00a9359337b469a41b8fa42cd88e7642e8393d91fdb1add277edfe77bde633e1cc SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e
-DIST ecasound-2.9.1.tar.gz 1057333 BLAKE2B 37e337d379ef649877278a4a3736ef98cde57aeee5a547d3a8e3b9d81785a8a33c964680a6b6871a26d097520f7eab20b186291698869014ec9a12c2ced49b28 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033
 DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140
 EBUILD ecasound-2.6.0-r1.ebuild 1727 BLAKE2B cb86bb09597a3acc6a6417234ff3acd299eb009ca00c57d0b8dbf617a6460d741df22d2f6ba9b8522ebe083ad6b5eb392f30f2bef0a8d5e6c00dbbd34f86e92d SHA512 decedce6d807ca441b8e70f0e5f24f0f60af1ecf66fc5883866fb2fb167b7e4d044d174d05f26c5abb4ce3e1ff8ba9a105a56be58099ac8f9af66483d92eeb2e
-EBUILD ecasound-2.9.1-r1.ebuild 2353 BLAKE2B d62833522dd8205e39637639dd10264b335a04cb506e3d5aaa0e0796be89e505dd2ea742d260868319f6c0d72a04a5d2fc469e8a61088cbd5409a1ef6719bcc9 SHA512 bac3979385c2a41d64ead2b62f317a262d03945bc68d7b082e2d8bd5d0a4826eb68a756c819eddd8b04d27cd2a64030adf5ac65c0743499e70ed36cf065e0fbc
-EBUILD ecasound-2.9.3.ebuild 2362 BLAKE2B eb2e89aa65b5b1ccd19a282657d66fdd6d410c04a8d1d1321533e9c72466df6e0894637849d21a45abe496c1d21482aae69ab70d3e039bdcc649aab21bee8d2d SHA512 8be6f0280687934b1efbf85d9ecf69508a0e9fef09120db9af29f52a2d262eb2fff210ed6aa22d2cb4e1b42a7230b566171f501a72e7bd676922d31fd7f71fab
+EBUILD ecasound-2.9.3.ebuild 2361 BLAKE2B 553799dac32741f7b69b79073293f375b4ec417a024258b13f9c3a82bd027c56ae0ab94d372e5be964f85fb136d16f37525c3ce5b9a69f8a254eeaaf24e21271 SHA512 519740ed9b74e44f9d335c5e1a5e5db7aff907ca7b8727469597f361aea9ecc74f8e8150a1713f26f7299958ab3763adb08ed32537a0996f3a10a9eb7acdf306
 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
deleted file mode 100644
index 3e33153f3ddf..000000000000
--- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils ltprune python-single-r1
-
-DESCRIPTION="a package for multitrack audio processing"
-HOMEPAGE="https://ecasound.seul.org/ecasound/"
-SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
-python ruby sndfile static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( lv2 )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib:= )
-	audiofile? ( media-libs/audiofile:= )
-	jack? ( virtual/jack:= )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lv2? ( >=media-libs/lilv-0.5.0:= )
-	media-libs/ladspa-sdk
-	mikmod? ( media-libs/libmikmod:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	oil? ( dev-libs/liboil:= )
-	osc? ( media-libs/liblo:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby )
-	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() {
-	default
-
-#	if use python ; then
-#		sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
-#			pyecasound/Makefile.am || die "sed failed"
-#	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local pyconf=()
-
-	if use python ; then
-		pyconf=( "--with-python-modules=${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" )
-	fi
-
-	econf \
-		--disable-arts \
-		--enable-shared \
-		--enable-sys-readline \
-		--with-largefile \
-		$(use_enable alsa) \
-		$(use_enable audiofile) \
-		$(use_enable debug) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate) \
-		$(use_enable lv2 liblilv) \
-		$(use_enable ncurses) \
-		$(use_enable oil liboil) \
-		$(use_enable osc liblo) \
-		$(use_enable oss) \
-		$(use_enable python pyecasound) \
-		$(use_enable ruby rubyecasound) \
-		$(use_enable sndfile) \
-		$(use_enable static-libs static) \
-		"${pyconf[@]}"
-}
-
-src_install() {
-	default
-	use python && python_optimize
-
-	if use doc ; then
-		dodoc Documentation/*.html
-		dodoc Documentation/programmers_guide/ecasound_programmers_guide.txt
-	fi
-
-	prune_libtool_files
-}
diff --git a/media-sound/ecasound/ecasound-2.9.3.ebuild b/media-sound/ecasound/ecasound-2.9.3.ebuild
index 1187b27286c8..1740b8de3da6 100644
--- a/media-sound/ecasound/ecasound-2.9.3.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
 python ruby sndfile static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
deleted file mode 100644
index 162e0224e6e4..000000000000
--- a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/kvutils/Makefile.am
-+++ b/kvutils/Makefile.am
-@@ -56,13 +56,12 @@
- 			kvu_value_queue.h
- 
- libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
--libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static
-+libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@
- 
- libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
- libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
- 
- libkvutils_tester_SOURCES = libkvutils_tester.cpp
--libkvutils_tester_LDFLAGS = -static
- libkvutils_tester_LDADD = $(lib_LTLIBRARIES)
- 
- noinst_HEADERS = $(kvutil_headers)
---- a/libecasound/Makefile.am
-+++ b/libecasound/Makefile.am
-@@ -364,7 +364,7 @@
- 
- libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
- libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
--libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
-+libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags)
- libecasound_la_LIBADD = $(eca_libadd)
- libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
- libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
---- 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)
- libecasound_plugins_la_LIBADD		= $(ECA_S_EXTRA_LIBS)
--libecasound_plugins_la_LDFLAGS 		= -static
-+libecasound_plugins_la_LDFLAGS 		=
- 
- libecasound_plugins_debug_la_SOURCES	= $(libecasound_plugins_la_SOURCES)
- EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
---- a/libecasoundc/Makefile.am
-+++ b/libecasoundc/Makefile.am
-@@ -14,9 +14,9 @@
- # !!!
- # remember to update eca-version.cpp
- if ECA_AM_DEBUG_MODE
--eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
-+eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
- else
--eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
-+eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
- endif
- 
- INCLUDES = -I$(srcdir)
---- a/pyecasound/Makefile.am
-+++ b/pyecasound/Makefile.am
-@@ -28,7 +28,7 @@
- 				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py
- endif
- if ECA_AM_PYECASOUND_CEXT
--pyecasound_install_list2 = 	pyecasound.so
-+pyecasound_install_list2 = 	.libs/pyecasound.so
- pyecasound_uninstall_list2 =   	$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so
- endif
-