gentoo resync : 23.09.2020

3 files changed, 2 insertions, 117 deletions

diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 4edd9e8577ea..9a1f009d21a4 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -4,6 +4,5 @@ AUX lash-0.5.4-strcmp.patch 252 BLAKE2B f2b002772df6dab5c2942039d36e681697894cc5
 AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434b823740c1cdd1bddd3c7a52ed505bc1acea64ddc145e1e7f9ffe7da31b7fd500f296b26c64d07c2a59149c49d18e0e4e0dc4e9e1a2 SHA512 39c3d82372592d6864a2c1e0de94ee150a434e107357ab549cf406cd58b7eb2f79cded6e97775f50e2e602906315aaf167869a53adb1b143eb3b5bb7147705bc
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
-EBUILD lash-0.5.4-r3.ebuild 2603 BLAKE2B fa39a5ae0e3cfaf3714956644a4b924d298c703bbb80f7b0e66bef1ecdc11bb71ba96138d4f14fd80ab4a6d54ac6ad9cb41ed2be81dcadd9a65e3efa39b35f0e SHA512 3bff50bcb0cb252bf992349795f8876e8c158e116426109a089312da0634704129d10ec51c456eeb3beae7834efd465b363a93c146eeee3d9aa659a5f5a791e3
-EBUILD lash-0.5.4-r4.ebuild 2604 BLAKE2B 8aa4ce537296456b08fe70eb1909a6552bea4f08aea2a790557f03e08fe24fcdb85e7ff41d2e5e830f5db8f115b7a6587efd3753bc6bf456e3109e9b678adac5 SHA512 a70e90c3f14edb454bc1f2e5befb1bb20a323a2846985df5677e8a952321ed26288d43dc7e389f66485c5895ef4be05eaead5c72c6bf2f07ed204a43f8e3db4a
+EBUILD lash-0.5.4-r4.ebuild 2601 BLAKE2B b4be88f579f6d7e081dd752a41ff4d0225276a78482164bd654f983107a597d7ff491b77e6cfd7bc05541b3f41319df288df628c284fbc69f4eef7503945cc17 SHA512 465759a5527aac1227ce4623165fe76707d0b0883b957a2d3817091cd22b022e072c15f0b63e75c36a7b623cd54e25ef7440c1e142bfe94fd9d422079d07bea8
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/lash/lash-0.5.4-r3.ebuild b/media-sound/lash/lash-0.5.4-r3.ebuild
deleted file mode 100644
index b424f12e6101..000000000000
--- a/media-sound/lash/lash-0.5.4-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils ltprune multilib-minimal python-single-r1
-
-DESCRIPTION="LASH Audio Session Handler"
-HOMEPAGE="http://www.nongnu.org/lash/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-IUSE="alsa debug gtk python static-libs" # doc
-
-RDEPEND="dev-libs/libxml2
-	virtual/jack
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	alsa? ( media-libs/alsa-lib )
-	gtk? ( x11-libs/gtk+:2 )
-	python? ( ${PYTHON_DEPS} )
-	|| ( sys-libs/readline dev-libs/libedit )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-1.3.40 )"
-# doc? ( >=app-text/texi2html-5 )
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/texi2html/s:-number:&-sections:' \
-		docs/Makefile.am || die #422045
-
-	epatch \
-		"${FILESDIR}"/${P}-glibc2.8.patch \
-		"${FILESDIR}"/${P}-swig_version_comparison.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-underlinking.patch \
-		"${FILESDIR}"/${P}-strcmp.patch
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-multilib_src_configure() {
-	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
-	export ac_cv_prog_lash_texi2html=no #422045
-
-	# --enable-pylash would disable it
-	local myconf=()
-	if ! multilib_is_native_abi || ! use python; then
-		myconf+=( --disable-pylash )
-	fi
-
-	if ! multilib_is_native_abi; then
-		# disable remaining configure checks
-		myconf+=(
-			JACK_CFLAGS=' '
-			JACK_LIBS=' '
-			XML2_CFLAGS=' '
-			XML2_LIBS=' '
-
-			vl_cv_lib_readline=no
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable alsa alsa-midi) \
-		$(multilib_native_use_enable gtk gtk2) \
-		$(multilib_native_use_enable debug) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C liblash
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		# headers
-		emake -C lash DESTDIR="${D}" install
-		# library
-		emake -C liblash DESTDIR="${D}" install
-		# pkg-config
-		emake DESTDIR="${D}" install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	dohtml docs/lash-manual-html-*/lash-manual.html
-	prune_libtool_files --all # --all for _lash.la in python directory
-	use python && python_optimize
-}
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
index 74b77f7bd7e0..95da6954e5d9 100644
--- a/media-sound/lash/lash-0.5.4-r4.ebuild
+++ b/media-sound/lash/lash-0.5.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 BDEPEND="