8 files changed, 159 insertions, 30 deletions
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index b795f27689d4..8b40eced0599 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -1,8 +1,9 @@
-AUX lash-0.5.4-gcc47.patch 317 BLAKE2B e886c0f87ed4e3b7b6f15387d38bf56962949d8088437a62c74a4dae9a8cc32a339bf98a35053174d5b987915fdfaf1deecbc80ef71c526d2a797ae5ab0f8c04 SHA512 a369cf98d10dcb6380fb72093fd02d6f0feec847dc4b3715bdf2dce29f4cb398a6ddf161f649470cb21407fcccfefc4ff28c66f3384eaaca3a866f8ae36a5c1a
-AUX lash-0.5.4-glibc2.8.patch 337 BLAKE2B cf2b31d29850a948f7d2ce9652b429c126bf59d8524d1dac35dcca560a9fbe2c615246be0bd51248d18ee0ed7962e857bd20899f2d23516ca02da641c1c939e3 SHA512 2391e1879a0979163f722fc97fd9950d7c91116481e80c738530510289e8a35c722d634e416ed01b2cb6aead21aea4b411be806df06cbe09cc17df9d483ab8fc
-AUX lash-0.5.4-strcmp.patch 278 BLAKE2B f6381f1c792c39b006e4e25134c07a3fb5f5cc97c98674905a1119a8f42db552667dabc4595038bb3653ab053b7bb04b3ae07a05d890255acbfe0f3c7815a43c SHA512 94d1985427e3b1b2fa2b9d9c86a1d0e82bf587c86b0e4a561a91848403944b9842d962a454808c3abb37ff011ad0054d8f69aef2d5849aa54699c71402d15685
-AUX lash-0.5.4-swig_version_comparison.patch 1124 BLAKE2B 12a4f3787c25ca8bd4b87ebe739486dbed52ad3f112c4a9237e4b3c4c76032c2804ea5ae23455b31a2804678af8c85f058f0acc44e1fc40beea400d217520397 SHA512 43e4bf0de6ee9eb5c010a317251ebc903569fe3d1b94f9c5c4c43ba1163088c5fb8df6d861d052184fd93baea61ac5c86f33a618f186cacaa74e27dd12cf0890
-AUX lash-0.5.4-underlinking.patch 457 BLAKE2B 0d21073bafc8ac50aa9b4a117c1268485ad131716b72fc0e2cb73b95ad8c3531c22bc6dacb420a54c68cad2185841911b238556a125395a7bc34b0879bbcb176 SHA512 09519a9b2fb2da9cd716c1460d503bba64265b26025bf987fa7a0eac2edbce5e88a59bccc2d39617c4c3ab62d4dba1e86c400922f5312c1904b1f5746f5a1fb6
+AUX lash-0.5.4-gcc47.patch 299 BLAKE2B 83e8d5805686e62a2a46b6c91283ac268dda892312210d8af0aca5f386bd2cc718917b9bdbe7db87819e5c10e7028c41c36b056b17885fbc0f999f8432e598ef SHA512 3f56550130b18becafbd9a1e544aaec6b729af398cd0abb95c17895baec65e9bba3a849122a787b8913fee7b4422b9ef0ee3fa9e627b1eec5db26543035f75a6
+AUX lash-0.5.4-glibc2.8.patch 344 BLAKE2B 6362c9d7ca824c26e0d037d80eb3221c2b4647cb999f7a16057d36e50b533a09c3228be72e7921ef8aadab7fdddb17317c85803b03144ae75392bfc9af9fd4ae SHA512 182cc371fbeb9ddd2407642b74fd5bb309f34c32ae1276d09d9c33c95ce9d065ea97df3a4306501fe151e2d3b4edc96c4140fabbc2c3016d8cba54fb0e8766cb
+AUX lash-0.5.4-strcmp.patch 252 BLAKE2B f2b002772df6dab5c2942039d36e681697894cc5b73d4bad7f5e27728e8e77c0032cc375a03b5ccb92c08a3e249b0539f8d3ece5a7007754af67693fbbeef4d9 SHA512 dba0d98fdd4f9cf84bb5c8e840fe76a3de8b729a7c2b88d55868939f119084433ae1bf5b7b3aacd1057995f73d6baa204878651cd9d0c4f419aca20910b84d66
+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 2604 BLAKE2B f278221e87da21abcb6e9bcbd5010a49fc0e2eed669b3a171a56fe79a5e4a78620ee9724c6e90fa6426990a9c798344eba9d99732247190ed49c96bf6747ef9d SHA512 935adfbe446a83ce08a09961b559cedbb1d53d21a6c00c3a75111e8c28568d7ab4ab5f7c6cd9298032cae8901134673a671646773b92861e2ae2dd2e6fbf19e4
+EBUILD lash-0.5.4-r3.ebuild 2603 BLAKE2B fa39a5ae0e3cfaf3714956644a4b924d298c703bbb80f7b0e66bef1ecdc11bb71ba96138d4f14fd80ab4a6d54ac6ad9cb41ed2be81dcadd9a65e3efa39b35f0e SHA512 3bff50bcb0cb252bf992349795f8876e8c158e116426109a089312da0634704129d10ec51c456eeb3beae7834efd465b363a93c146eeee3d9aa659a5f5a791e3
+EBUILD lash-0.5.4-r4.ebuild 2609 BLAKE2B 278d8e78c576252427cfcc0c335de89bc670c3240e14e54f97b0cc9c5607d96107afc51496a82b6ea392cd67658d60b334edd477ac03b79ece5684fd4d3d8179 SHA512 7f19030014a567f04ccba189e742c3422ee40818032559394178d31f102f0eea44b30baa665f31ddba01b0ee81c09aae5dc22d48c3b78e129c6a9d5a6748a769
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/lash/files/lash-0.5.4-gcc47.patch b/media-sound/lash/files/lash-0.5.4-gcc47.patch
index c1afeda71e90..c988ba0e37c4 100644
--- a/media-sound/lash/files/lash-0.5.4-gcc47.patch
+++ b/media-sound/lash/files/lash-0.5.4-gcc47.patch
@@ -1,8 +1,7 @@
-http://bugs.gentoo.org/451668
-http://pkgs.fedoraproject.org/cgit/lash.git/tree/lash-gcc47.patch
-
---- liblash/lash.c
-+++ liblash/lash.c
+diff --git a/liblash/lash.c b/liblash/lash.c
+index b47251d..f2a5095 100644
+--- a/liblash/lash.c
++++ b/liblash/lash.c
 @@ -22,6 +22,7 @@
  #include <string.h>
  #include <strings.h>
diff --git a/media-sound/lash/files/lash-0.5.4-glibc2.8.patch b/media-sound/lash/files/lash-0.5.4-glibc2.8.patch
index 56bc89af0291..578df171a462 100644
--- a/media-sound/lash/files/lash-0.5.4-glibc2.8.patch
+++ b/media-sound/lash/files/lash-0.5.4-glibc2.8.patch
@@ -1,5 +1,7 @@
---- liblash/socket.c.old	2008-06-26 15:20:44.227064193 +0200
-+++ liblash/socket.c	2008-06-26 15:21:18.245063129 +0200
+diff --git a/liblash/socket.c b/liblash/socket.c
+index b6e1b25..91caf0f 100644
+--- a/liblash/socket.c
++++ b/liblash/socket.c
 @@ -20,6 +20,11 @@
  
  #define _POSIX_SOURCE /* addrinfo */
diff --git a/media-sound/lash/files/lash-0.5.4-strcmp.patch b/media-sound/lash/files/lash-0.5.4-strcmp.patch
index ea9f7ee2fda3..866b8fec569d 100644
--- a/media-sound/lash/files/lash-0.5.4-strcmp.patch
+++ b/media-sound/lash/files/lash-0.5.4-strcmp.patch
@@ -1,7 +1,7 @@
-clients/synth/lash.c:85:2: warning: implicit declaration of function ‘strcmp’ [-Wimplicit-function-declaration]
-
---- clients/synth/lash.c
-+++ clients/synth/lash.c
+diff --git a/clients/synth/lash.c b/clients/synth/lash.c
+index 03717ae..5395198 100644
+--- a/clients/synth/lash.c
++++ b/clients/synth/lash.c
 @@ -22,6 +22,7 @@
  
  #include "config.h"
diff --git a/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
index 6dcd4366da7c..fe20c43b1c84 100644
--- a/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
+++ b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
@@ -1,6 +1,8 @@
---- acinclude.m4
-+++ acinclude.m4
-@@ -40,9 +40,9 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index 4722b53..ea37316 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,9 +40,9 @@ AC_DEFUN([AC_PROG_SWIG],[
                          if test -z "$available_patch" ; then
                                  [available_patch=0]
                          fi
diff --git a/media-sound/lash/files/lash-0.5.4-underlinking.patch b/media-sound/lash/files/lash-0.5.4-underlinking.patch
index 3e52807d267f..3fa552721c4e 100644
--- a/media-sound/lash/files/lash-0.5.4-underlinking.patch
+++ b/media-sound/lash/files/lash-0.5.4-underlinking.patch
@@ -1,9 +1,8 @@
-http://bugs.gentoo.org/367589
-http://bugs.gentoo.org/514748
-
---- clients/control/Makefile.am
-+++ clients/control/Makefile.am
-@@ -18,6 +18,7 @@
+diff --git a/clients/control/Makefile.am b/clients/control/Makefile.am
+index d3eaab2..af91a70 100644
+--- a/clients/control/Makefile.am
++++ b/clients/control/Makefile.am
+@@ -18,6 +18,7 @@ lash_control_CFLAGS = $(LASH_CFLAGS)
  
  lash_control_LDADD = \
  	$(top_builddir)/liblash/liblash.la \
@@ -12,9 +11,11 @@ http://bugs.gentoo.org/514748
 +	$(UUID_LIBS)
  
  endif
---- clients/synth/Makefile.am
-+++ clients/synth/Makefile.am
-@@ -20,4 +20,5 @@
+diff --git a/clients/synth/Makefile.am b/clients/synth/Makefile.am
+index 59437ce..fe999a0 100644
+--- a/clients/synth/Makefile.am
++++ b/clients/synth/Makefile.am
+@@ -20,4 +20,5 @@ lash_synth_LDADD = \
  	$(JACK_LIBS) \
  	$(ALSA_LIBS) \
  	$(GTK2_LIBS) \
diff --git a/media-sound/lash/lash-0.5.4-r3.ebuild b/media-sound/lash/lash-0.5.4-r3.ebuild
index c1db67791ac0..b424f12e6101 100644
--- a/media-sound/lash/lash-0.5.4-r3.ebuild
+++ b/media-sound/lash/lash-0.5.4-r3.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
 
 RDEPEND="dev-libs/libxml2
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
new file mode 100644
index 000000000000..3b1f8030c14b
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools eutils 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
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/libxml2
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	gtk? ( x11-libs/gtk+:2 )
+	python? ( ${PYTHON_DEPS} )
+	|| ( sys-libs/readline dev-libs/libedit )
+"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+HTML_DOCS=( docs/lash-manual-html-one-page/lash-manual.html )
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc2.8.patch
+	"${FILESDIR}"/${P}-swig_version_comparison.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-strcmp.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/texi2html/s:-number:&-sections:' \
+		docs/Makefile.am || die #422045
+
+	default
+
+	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() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+}