Revision: 3198
Author: dominique
Date: 2020-10-24 09:19:37 +0200 (Sat, 24 Oct 2020)
Log Message:
-----------
remove virtual/liblash
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/lash/ChangeLog
trunk/overlays/proaudio/media-sound/lash/Manifest
trunk/overlays/proaudio/media-sound/lash/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/lash/files/
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-aclocal.patch
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-include.patch
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-underlinking.patch
trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2-r1.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/lash/lash-9998.ebuild
trunk/overlays/proaudio/media-sound/lash-original/
trunk/overlays/proaudio/virtual/
Modified: trunk/overlays/proaudio/media-sound/lash/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/ChangeLog 2020-10-22 00:13:03 UTC
(rev 3197)
+++ trunk/overlays/proaudio/media-sound/lash/ChangeLog 2020-10-24 07:19:37 UTC
(rev 3198)
@@ -1,29 +1,50 @@
-# ChangeLog for media-sound/lash
+# ChangeLog for media-sound/lash-original
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
- 11 Sep 2017; Dominique Michel <dominique_li...@sourceforge.net>
- lash-9998.ebuild, metadata.xml:
- eapi 6 bump
+ 11 Dec 2017; Dominique Michel <dominique_li...@sourceforge.net>
+ lash-original-0.6.0_rc2-r1.ebuild:
+ various fixes from portage
- 17 Mar 2013; Karl Linden (lilrc) <li...@users.sourceforge.net>
- lash-9998.ebuild, metadata.xml:
- Added USE flag description.
- Fixed typo.
- Keyworded to not generate repoman warnings.
- Made repoman happy by adding a license and removing whitespaces.
+ 03 Apr 2015; Karl Linden (lilrc) <li...@users.sourceforge.net>
+ lash-original-0.6.0_rc2-r1.ebuild,
+ +files/lash-original-0.6.0_rc2-aclocal.patch,
+ files/lash-original-0.6.0_rc2-include.patch,
+ -files/lash-0.6.0_rc2-texi2html.diff,
+ +files/lash-original-0.6.0_rc2-underlinking.patch:
+ add multilib support
+ fix fetching
+ fix underlinking
+ fix repoman warnings
+ drop version specifiers
+ drop unnecessary uninstall message
+ remove unused patch
+ 31 Jul 2013; Karl Linden (lilrc) <li...@users.sourceforge.net>
+ -lash-original-0.6.0_rc2.ebuild:
+ Removed old non-python-r1-migrated ebuild.
+
+*lash-original-0.6.0_rc2-r1 (06 Jun 2013)
+
+ 06 Jun 2013; Karl Linden (lilrc) <li...@users.sourceforge.net>
+ +lash-original-0.6.0_rc2-r1.ebuild,
+ +files/lash-original-0.6.0_rc2-include.patch:
+ Move to autotools-utils and python-single-r1 eclass.
+ Move to EAPI 5.
+ Restrict mirror.
+ Building of documentation fails even with previous patch applied. The
+ documentation is therefore hard disabled.
+ Fix faulty arguments to configure.
+ Add patch to compile properly with alsa disabled.
+
+ 03 Feb 2013; Karl Linden (lilrc) <li...@users.sourceforge.net>
+ lash-original-0.6.0_rc2.ebuild:
+ keyword for ~ppc, depend on virtual/pkgconfig
+
27 Dec 2012; Dominique Michel <dominique_li...@sourceforge.net>
- -Moved all lash stufs to media-sound/lash-original
- +lash-9998.ebuild; fake virtual ebuild that will depend on one of
- media-sound/lash-original and media-sound/ladish.
- This is needed because all the portage ebuilds depend on media-sound/lash
- and they will block media-sound/ladish. The same block will append if
- virtual/liblash or some other package want to install ladish.
-
- Complex dependencies are needed or portage can get confused
- during world update.
-
- All new ebuilds should depend on virtual/liblash instead of media-sound/lash.
+ Renamed media-sound/lash to media-sound/lash-original
+ due to media-sound/ladish import and blocking with packages
+ depending on media-sound/lash.
+ For new ebuilds, please use (R)DEPEND="virtual/liblash" instead.
11 Nov 2012; Karl Lindén <spray.su...@gmail.com>;
lash-0.6.0_rc2.ebuild: added python_convert_shebangs to ebuild
Modified: trunk/overlays/proaudio/media-sound/lash/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/Manifest 2020-10-22 00:13:03 UTC
(rev 3197)
+++ trunk/overlays/proaudio/media-sound/lash/Manifest 2020-10-24 07:19:37 UTC
(rev 3198)
@@ -1,3 +1,7 @@
-EBUILD lash-9998.ebuild 551 SHA256
3f5abfc3e586440f723b817103dde1496643e19c1f450066241d3034d0b69efb SHA512
581c2b02ab5eaacd8b2003cf6d7327a0ee41ddf43247d9b493a956a490b9d3b26c45c9ee2393315d3e3ff2d8dcdf104271cb5dc1433b8a1bd106b84f75f86736
WHIRLPOOL
e9716897636d02d23349d070d610f3b2225d345dda1098feae1086ef3c48892cd2c41efd98fb05899b8c524b8a8b9e135601e782426d86306e9d47e2e54f9398
-MISC ChangeLog 2007 SHA256
11459565b8a5d3b82d85c1b893d8d8dd2c3b77bcc9af04d3efd69e8a50f78e07 SHA512
8544904b4da7e03f893fe3054bc12b0cd9254dee4967860aa10c567eb783b76cf03c869faba7fdf5cec7996113aa605e0666094650c2d99d7d15a04ba6a4dccd
WHIRLPOOL
21cb9be4030f9a16cb39c6bc5cb4637951b7b32a08ddab0898d4d7ae8c6c91aab139c62ecc2b43df24302270e3d3e311c84ea31df4061d371a51ea83542c143e
-MISC metadata.xml 343 SHA256
d3d01293ba2b67ca01d7d5d2b4786186a52bd085011414530b64d4262fb5f8db SHA512
0899bffb73737c9ce280559576e89764d7737f17dbac825c825ffa4abfe12f52b4be6fcf26631165fd77968250334620d50daab02dd7ec74e46f3e023d6a5a96
WHIRLPOOL
07ec63b60add386cab017017a99bde16e69530ef072f321d11af0bf686dfc4a2eeef25605409d4c5df8f20782b163e4127b9722a5b6539c06081f19c0645d5c5
+AUX lash-original-0.6.0_rc2-aclocal.patch 906 BLAKE2B
6db707a58bc96348286f03df3e777bde5b6f7f401f976f08b8083e4647083faa78915d3ea0c3ccec846fbe41d558b6a94cd4b7dee539fd0aa06bce539cc88fea
SHA512
619019974fb3a68190a8571668919480a78272077916cb50f18b00f6b12dd8e1c515bfee74eaf39cf0626355966843c3af98ff9c4793d1ded141f56919c25317
+AUX lash-original-0.6.0_rc2-include.patch 503 BLAKE2B
6d1b437b23e41f156660139a4b1643de41b1b6dd3a773c371e7882334b6a46320a1c201c29704902f3e58e5e5388a5b889be8bbf9c66d963e5294a2e8d2b4bae
SHA512
495f24b0acc18ed67e029d1dd47ab187db5319fde2b7a8af01d5b65728c7ba3e8fecc510648427a539ea09ec17dc8813498b5ae0d7bfbdb3b7295e6b15d6cca3
+AUX lash-original-0.6.0_rc2-underlinking.patch 860 BLAKE2B
d6359cb21d66e501529bd25ef5c4990d19154c5abc94bd304cdcb56bd44a6976efb93ea2f61c4b8a010e079d892f82ae7deb6cd8785cbcedf9bdd29b712d1c3e
SHA512
524703cf135cc9d2654fdffc9a1ec73998a76140f4c74738464b6d92bb44eafe4ae30b8aaf59a3edc4b9356d73f63e83f38fc6690dfd8fd46c6c6201d0b00380
+DIST lash-0.6.0~rc2.tar.bz2 431891 BLAKE2B
37ea1f428f70b6ecbe723e0ab5f7009be120f680c03e89d405ad957ac5bfad16ad611e93d9fe37249cbc574f88ad75a1234cf726c64700985d8b8e53debff295
SHA512
704e24ccadccb469e820be5fb58dd4d953a8fc2903cd857a290267a87dda596639ec381d5cb7cdfcd715df7d98d6570e52731bddd17f8a3425edd8b699632401
+EBUILD lash-0.6.0_rc2-r1.ebuild 2436 BLAKE2B
c0f0a40107966ac607dfc29338397d010a360eee12fde6bb680e14d089aa44cd179f0b66f24da8dc07fea163ac7c0cb38c7279cb4b16926a70fbbd9a6d9c7b84
SHA512
5d3ffbfaf03806ab89fe5a62a398fcbc69b07ee40f8ba5523f1a31a3a30611538b75c07c8bdab01a2715dd8d007ba7f491323266ab5a7c3f448a1820950612c3
+MISC ChangeLog 2683 BLAKE2B
0a3e75b13d4d751e46f2b11c5f4429f5e66f1beddb28e4f9b15e0b3f47bcb1c7c2e0518f6af0552c886ea9db9ace8b7cd2490286e9d3eae5e54afb4d853ff7bc
SHA512
cd3ec60feff061c1d53fc9901b9c35e40362dec897a6e2f2c11b4eb9cf88ae3d5331b771de11276b22dd73606055ff567228a2cb2e121578efee00951a95ee4a
+MISC metadata.xml 261 BLAKE2B
ab09b95e48499595f240d83a5a2328b206d5983b57bbd4f6a0ba5f695a5be713ca35aaa6106a06a83a2e471d646e2ae12069c0779178823f1f9f30bd234a1dfe
SHA512
590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1
Added:
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-aclocal.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-aclocal.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-aclocal.patch
2020-10-24 07:19:37 UTC (rev 3198)
@@ -0,0 +1,25 @@
+# Author: Karl Linden (lilrc) <li...@users.sourceforge.net>
+# A patch to make sure package provided aclocal macros are found.
+
+diff -ur lash-0.6.0.594.orig/Makefile.am lash-0.6.0.594/Makefile.am
+--- lash-0.6.0.594.orig/Makefile.am 2015-03-19 23:22:45.955307671 +0100
++++ lash-0.6.0.594/Makefile.am 2015-04-03 09:26:25.239980837 +0200
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = m4 docs lash common dbus liblash lashd clients icons pylash
+
+ pkgconfigdir = $(libdir)/pkgconfig
+diff -ur lash-0.6.0.594.orig/configure.ac lash-0.6.0.594/configure.ac
+--- lash-0.6.0.594.orig/configure.ac 2015-03-19 23:22:45.954307671 +0100
++++ lash-0.6.0.594/configure.ac 2015-04-03 09:25:41.968979896 +0200
+@@ -1,8 +1,8 @@
+ AC_INIT([LASH],[0.6.0])
+ AC_CONFIG_SRCDIR([lash/types.h])
+ AC_CONFIG_HEADER([config.h])
++AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE
+-#AM_ACLOCAL_INCLUDE([m4])
+
+
+ ### Check for programs ###
Added:
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-include.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-include.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-include.patch
2020-10-24 07:19:37 UTC (rev 3198)
@@ -0,0 +1,14 @@
+# Author: Karl Linden (lilrc) <li...@users.sourceforge.net>
+# A patch to include uuid/uuid.h even when alsa is not built.
+
+diff -ur lash-0.6.0.594.orig/lashd/server.h lash-0.6.0.594/lashd/server.h
+--- lash-0.6.0.594.orig/lashd/server.h 2008-09-23 01:54:38.000000000 +0200
++++ lash-0.6.0.594/lashd/server.h 2013-06-06 11:36:31.270051682 +0200
+@@ -26,6 +26,7 @@
+ #include <stdbool.h>
+ #include <sys/types.h>
+ #include <dbus/dbus.h>
++#include <uuid/uuid.h>
+
+ #include "types.h"
+ #include "dbus/service.h"
Added:
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-underlinking.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-underlinking.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/lash/files/lash-original-0.6.0_rc2-underlinking.patch
2020-10-24 07:19:37 UTC (rev 3198)
@@ -0,0 +1,24 @@
+# Author: Karl Linden (lilrc) <li...@users.sourceforge.net>
+# This patch fixes underlinking issues.
+
+diff -ur lash-0.6.0.594.orig/clients/synth/Makefile.am
lash-0.6.0.594/clients/synth/Makefile.am
+--- lash-0.6.0.594.orig/clients/synth/Makefile.am 2015-03-19
23:22:45.961307671 +0100
++++ lash-0.6.0.594/clients/synth/Makefile.am 2015-04-03 09:33:12.024989681
+0200
+@@ -19,4 +19,4 @@
+ $(JACK_LIBS) \
+ $(ALSA_LIBS) \
+ $(GTK2_LIBS) \
+- -lpthread
++ -lm -lpthread
+diff -ur lash-0.6.0.594.orig/lashd/Makefile.am lash-0.6.0.594/lashd/Makefile.am
+--- lash-0.6.0.594.orig/lashd/Makefile.am 2015-03-19 23:22:45.959307671
+0100
++++ lash-0.6.0.594/lashd/Makefile.am 2015-04-03 09:32:12.345988383 +0200
+@@ -46,7 +46,7 @@
+ $(UUID_LIBS) \
+ $(DBUS_LIBS) \
+ $(top_builddir)/dbus/liblashdbus.a \
+- -lstdc++ -lutil
++ -ldl -lstdc++ -lutil
+
+ AM_CFLAGS = \
+ $(LASH_CFLAGS) \
Added: trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2-r1.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2-r1.ebuild
2020-10-24 07:19:37 UTC (rev 3198)
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-single-r1 multilib-minimal
+
+MY_PV="${PV/_/~}"
+MY_PN="${PN/-original/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="LASH Audio Session Handler"
+HOMEPAGE="http://www.nongnu.org/lash/";
+SRC_URI="http://download.savannah.gnu.org/releases/${MY_PN}/${MY_P}.tar.bz2";
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa debug gtk python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+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 )"
+
+S="${WORKDIR}/${MY_PN}-0.6.0.594"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-aclocal.patch
+ "${FILESDIR}"/${P}-include.patch
+ "${FILESDIR}"/${P}-underlinking.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() {
+ # Generation of docs does no longer work. Hard disable it.
+ export ac_cv_prog_lash_texi2html="no" #422045
+
+ local myeconf=()
+ if ! multilib_is_native_abi || ! use python; then
+ myconf+=( --without-python )
+ fi
+
+ if ! multilib_is_native_abi; then
+ # disable remaining configure checks
+ myconf+=(
+ JACK_CFLAGS=' '
+ JACK_LIBS=' '
+ XML2_CFLAGS=' '
+ XML2_LIBS=' '
+
+ v1_cv_lib_readline=no
+ )
+ fi
+
+ ECONF_SOURCE=${S}
+
+ econf \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable debug) \
+ $(multilib_native_use_with alsa) \
+ $(multilib_native_use_with gtk gtk2) \
+ "${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-pkgconfogDATA
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all # --all for _lash.la in python directory
+ use python && python_optimize
+}
Deleted: trunk/overlays/proaudio/media-sound/lash/lash-9998.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/lash-9998.ebuild 2020-10-22
00:13:03 UTC (rev 3197)
+++ trunk/overlays/proaudio/media-sound/lash/lash-9998.ebuild 2020-10-24
07:19:37 UTC (rev 3198)
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Temporary wrapper for liblash (lash) and ladish"
-HOMEPAGE="http://proaudio.tuxfamily.org/";
-SRC_URI=""
-
-# A license is needed. Both LASH and LADISH are licensed under the GPL-2.
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="ladish python"
-
-RDEPEND="ladish? ( media-sound/ladish[lash,python?]
- !media-sound/lash-original )
- !ladish? ( media-sound/lash-original[python?]
- !media-sound/ladish )"
-DEPEND="${RDEPEND}"
Modified: trunk/overlays/proaudio/media-sound/lash/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/metadata.xml 2020-10-22
00:13:03 UTC (rev 3197)
+++ trunk/overlays/proaudio/media-sound/lash/metadata.xml 2020-10-24
07:19:37 UTC (rev 3198)
@@ -5,7 +5,4 @@
<email>proau...@tuxfamily.org</email>
<name>pro-audio overlay team</name>
</maintainer>
- <use>
- <flag name="ladish">Pull in <pkg>media-sound/ladish</pkg></flag>
- </use>
</pkgmetadata>
