| [proaudio] [2933] media-sound/lash-original: fix fetching and underlinking, add multilib support, other various fixes and improvements |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2933
Author: lilrc
Date: 2015-04-03 10:26:18 +0200 (Fri, 03 Apr 2015)
Log Message:
-----------
media-sound/lash-original: fix fetching and underlinking, add multilib support, other various fixes and improvements
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/lash-original/ChangeLog
trunk/overlays/proaudio/media-sound/lash-original/Manifest
trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-include.patch
trunk/overlays/proaudio/media-sound/lash-original/lash-original-0.6.0_rc2-r1.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-aclocal.patch
trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-underlinking.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/lash-original/files/lash-0.6.0_rc2-texi2html.diff
Modified: trunk/overlays/proaudio/media-sound/lash-original/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/ChangeLog 2015-04-03 07:12:21 UTC (rev 2932)
+++ trunk/overlays/proaudio/media-sound/lash-original/ChangeLog 2015-04-03 08:26:18 UTC (rev 2933)
@@ -1,7 +1,21 @@
# ChangeLog for media-sound/lash-original
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Apr 2015; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ 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) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
-lash-original-0.6.0_rc2.ebuild:
Removed old non-python-r1-migrated ebuild.
Modified: trunk/overlays/proaudio/media-sound/lash-original/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/Manifest 2015-04-03 07:12:21 UTC (rev 2932)
+++ trunk/overlays/proaudio/media-sound/lash-original/Manifest 2015-04-03 08:26:18 UTC (rev 2933)
@@ -1,6 +1,7 @@
-AUX lash-0.6.0_rc2-texi2html.diff 2054 SHA256 40d76da366d8f82f3ff060d896fd3a682f7f443648313f309b6327cfe6dd0cee SHA512 07a5b0815a86805db2a18f3fa5caf454e3a45b9f45f71678605c6accfc40ce0e3299bf64e64dfcf4a72ee344fd3956e269560684eedfaf6ea6ef8994726587ce WHIRLPOOL 2c21beedfb0ebf07eefa7b75868e96a33d5a30fa8b40ac00d4348b74ebb871155550a5c9cfd73a3c0899fe9c8979c31b2eec7f996a9c3ae9691c80c094cdfb9a
-AUX lash-original-0.6.0_rc2-include.patch 504 SHA256 354c25e62bb491320836965f5d31691a688d95eaa3b30af5c834f606def603e4 SHA512 47f181484c7d17fe4a7b78dd50eecab0e6c9d9b5a3d65324e744d8afe3695679e0da559e349d2e741fa7c4a97d97322a45b16a345286176c7218fce804c9e0e6 WHIRLPOOL 46a204b4f118feb33f22729ac07a8cbbf45192e05f5b62a8ea21f6214af1d2c3a035b59d06ae0664a9742d4cd536086f3fac1f4b88f8542f8d8708fb4bfcea10
+AUX lash-original-0.6.0_rc2-aclocal.patch 906 SHA256 b29466da7477864c33c964c729d47165e3c761e66cb1bcc677b7aa7ea583daea SHA512 619019974fb3a68190a8571668919480a78272077916cb50f18b00f6b12dd8e1c515bfee74eaf39cf0626355966843c3af98ff9c4793d1ded141f56919c25317 WHIRLPOOL 85af20a58ed3788c96ac6599bda526990326a7a4839c98b57d3e9853601a1633eadd68e8918f7445c85c71582b06060be614f62fceb0e88246b4513bad8b4572
+AUX lash-original-0.6.0_rc2-include.patch 503 SHA256 1f05d3d07cb399167e218364e142f5cf75ba54e6d775c0d691c607b7a23101eb SHA512 495f24b0acc18ed67e029d1dd47ab187db5319fde2b7a8af01d5b65728c7ba3e8fecc510648427a539ea09ec17dc8813498b5ae0d7bfbdb3b7295e6b15d6cca3 WHIRLPOOL ea91a332e073e004beca682b5da9c3a430f3b3f8c73ebf6430aca10425f62bc0045180ecb7cee3ad740107f0a9a94b9b1b0dfa046a217b8d9eda41eb3c20edec
+AUX lash-original-0.6.0_rc2-underlinking.patch 860 SHA256 011279abdbc0a28188c2821e2afec7aa59c398aa9e450fbf17ee9f1d201f656c SHA512 524703cf135cc9d2654fdffc9a1ec73998a76140f4c74738464b6d92bb44eafe4ae30b8aaf59a3edc4b9356d73f63e83f38fc6690dfd8fd46c6c6201d0b00380 WHIRLPOOL 97a64b159f85ffba1c6474c40cd0fcf7d581f858e9f2be2421d6b840a99c22cbf81ca7c424512db3fdf26186f6ac3946e8cf71349a23f71dbe7bd2f811ce6e21
DIST lash-0.6.0~rc2.tar.bz2 431891 SHA256 3c1eb2bd88e1a0722dea5c24be4ede1d80848c963d41751973fae73c47dfe18b SHA512 704e24ccadccb469e820be5fb58dd4d953a8fc2903cd857a290267a87dda596639ec381d5cb7cdfcd715df7d98d6570e52731bddd17f8a3425edd8b699632401 WHIRLPOOL b6de62365af169e61a0d93a73366dca7d2be4aa759ddc3da16d02c0a0aba05c549e237a73b0ec3b7ac8ed258cf846d6cd699940cf73127cdec404107371523a3
-EBUILD lash-original-0.6.0_rc2-r1.ebuild 2138 SHA256 ffe54985f18fe6412f3f160086845ffb3cf743baf67e6c4c8ad1c388f8d4cd70 SHA512 1846fd7a93721a1073af0c4da087fa07e034e652a63c95d9e86cdf7ed5d11db31c8f28f9d7958528e5cbe69f1bce53d6a25923b05679f6af7c8e3a8509f686a2 WHIRLPOOL a27367d4309a45e9e73467e0ee785c05e53dba09b6e1ea43c3722c8348b44620f48694a3640a42736c359adac701a375b480ce26a1f5ce6426ed7e6c7f978066
-MISC ChangeLog 2107 SHA256 21a08a7c3e15c10744f33b6ae0495efe040cfaa90b925ff228919f1e6f4c97a0 SHA512 c67f839c3383087f7e9b3df2efae99b5408d9056dde3381573ac24523d1fadce41ec93fcdb64332d1be6c055490c9d3c0919cd807a8f7ef5fb3810eae232a758 WHIRLPOOL f7bfd6b515ab86738690d47c69fd9b6d2a3ed7ced67b2680f70047d887c0848131723c0297c10b82ee56faf785ab9d33e49c77b9c7a4f37ca6ed3358160991a1
+EBUILD lash-original-0.6.0_rc2-r1.ebuild 2454 SHA256 f7c654b873766ffd28728c9a07e9f44a73cc977e3d3f02aeff40335e83f9617b SHA512 e4dd09935ad2228454e9e2f1c8ad3b4bb57ddddc607116dca3479d502101b830dadb7cb6bc1b06716f6a11f0ea75e15ce7a99a5ad32ca08541ef4c755145b08b WHIRLPOOL 822faa7f8991373e9a48571ea796f09015bb1b42efbd560abd84af2b0e2f131812c3da76b8764a801e7d810d87212fac55eb6acafbaa398779657af1895d2c7c
+MISC ChangeLog 2563 SHA256 eaf1971b4742c794e4a523bebac99d49674dca731fc592bbe853a4305f95a545 SHA512 d325a1b6f27690f10575c039f06df2423b39ab1c398ca558d058383ff1d1c81810d0f7ba59fc5cbb6a00665121d12cc70af47fcfd48dcb7b5d77c4eb44fb827d WHIRLPOOL 3b458182d42dfbedb4ba99fcc19c676b3957bdfb2186210abdb918c447408e10e5221a6e79da2c1fd13f5cc03012a219599e46697fc993f36d9af928d2ac78db
MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Deleted: trunk/overlays/proaudio/media-sound/lash-original/files/lash-0.6.0_rc2-texi2html.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/files/lash-0.6.0_rc2-texi2html.diff 2015-04-03 07:12:21 UTC (rev 2932)
+++ trunk/overlays/proaudio/media-sound/lash-original/files/lash-0.6.0_rc2-texi2html.diff 2015-04-03 08:26:18 UTC (rev 2933)
@@ -1,46 +0,0 @@
-*** docs/Makefile.am~ Tue Nov 20 00:00:28 2007
---- docs/Makefile.am Sun Jun 3 05:14:51 2012
-***************
-*** 18,26 ****
- mkdir -lash-manual-html-split; \
- fi
- cd lash-manual-html-one-page && \
-! texi2html --number ../$(top_srcdir)/docs/lash-manual.texi
- cd lash-manual-html-split && \
-! texi2html --number --split=chapter ../$(top_srcdir)/docs/lash-manual.texi
- touch html-manual-stamp
-
- CLEANFILES = html-manual-stamp lash-manual.cps
---- 18,26 ----
- mkdir -lash-manual-html-split; \
- fi
- cd lash-manual-html-one-page && \
-! texi2html ../$(top_srcdir)/docs/lash-manual.texi
- cd lash-manual-html-split && \
-! texi2html --split=chapter ../$(top_srcdir)/docs/lash-manual.texi
- touch html-manual-stamp
-
- CLEANFILES = html-manual-stamp lash-manual.cps
-*** docs/Makefile.in Sun Jun 3 05:17:46 2012
---- docs/Makefile.in~ Sun Nov 9 23:45:28 2008
-***************
-*** 527,535 ****
- @HAVE_TEXI2HTML_TRUE@ mkdir -lash-manual-html-split; \
- @HAVE_TEXI2HTML_TRUE@ fi
- @HAVE_TEXI2HTML_TRUE@ cd lash-manual-html-one-page && \
-! @HAVE_TEXI2HTML_TRUE@ texi2html --number ../$(top_srcdir)/docs/lash-manual.texi
- @HAVE_TEXI2HTML_TRUE@ cd lash-manual-html-split && \
-! @HAVE_TEXI2HTML_TRUE@ texi2html --number --split=chapter ../$(top_srcdir)/docs/lash-manual.texi
- @HAVE_TEXI2HTML_TRUE@ touch html-manual-stamp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- 527,535 ----
- @HAVE_TEXI2HTML_TRUE@ mkdir -lash-manual-html-split; \
- @HAVE_TEXI2HTML_TRUE@ fi
- @HAVE_TEXI2HTML_TRUE@ cd lash-manual-html-one-page && \
-! @HAVE_TEXI2HTML_TRUE@ texi2html ../$(top_srcdir)/docs/lash-manual.texi
- @HAVE_TEXI2HTML_TRUE@ cd lash-manual-html-split && \
-! @HAVE_TEXI2HTML_TRUE@ texi2html --split=chapter ../$(top_srcdir)/docs/lash-manual.texi
- @HAVE_TEXI2HTML_TRUE@ touch html-manual-stamp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Added: trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-aclocal.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-aclocal.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-aclocal.patch 2015-04-03 08:26:18 UTC (rev 2933)
@@ -0,0 +1,25 @@
+# Author: Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+# 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 ###
Modified: trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-include.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-include.patch 2015-04-03 07:12:21 UTC (rev 2932)
+++ trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-include.patch 2015-04-03 08:26:18 UTC (rev 2933)
@@ -1,4 +1,4 @@
-# Author: Karl Lindén (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+# Author: Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
# 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
Added: trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-underlinking.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-underlinking.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/lash-original/files/lash-original-0.6.0_rc2-underlinking.patch 2015-04-03 08:26:18 UTC (rev 2933)
@@ -0,0 +1,24 @@
+# Author: Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+# 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) \
Modified: trunk/overlays/proaudio/media-sound/lash-original/lash-original-0.6.0_rc2-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/lash-original-0.6.0_rc2-r1.ebuild 2015-04-03 07:12:21 UTC (rev 2932)
+++ trunk/overlays/proaudio/media-sound/lash-original/lash-original-0.6.0_rc2-r1.ebuild 2015-04-03 08:26:18 UTC (rev 2933)
@@ -1,13 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils eutils python-single-r1
+AUTOTOOLS_AUTORECONF=yes
+inherit autotools-utils eutils python-single-r1 multilib-minimal
-MY_PV="${PV/_/~}"
+MY_PV="${PV/_/\~}"
MY_PN="${PN/-original/}"
MY_P="${MY_PN}-${MY_PV}"
@@ -22,40 +23,55 @@
IUSE="alsa debug gtk python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="alsa? ( media-libs/alsa-lib )
- media-sound/jack-audio-connection-kit
- dev-libs/libxml2
- gtk? ( >=x11-libs/gtk+-2.0 )
+RDEPEND="
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-apps/util-linux[${MULTILIB_USEDEP}]
+ alsa? ( media-libs/alsa-lib )
+ gtk? ( x11-libs/gtk+:2 )
python? ( ${PYTHON_DEPS} )
- || ( sys-libs/readline dev-libs/libedit )"
+ || ( sys-libs/readline:= dev-libs/libedit )"
DEPEND="${RDEPEND}
virtual/pkgconfig
- python? ( >=dev-lang/swig-1.3.31 )"
+ python? ( dev-lang/swig )"
S="${WORKDIR}/${MY_PN}-0.6.0.594"
-PATCHES=( "${FILESDIR}/${P}-include.patch" )
+PATCHES=(
+ "${FILESDIR}"/${P}-aclocal.patch
+ "${FILESDIR}"/${P}-include.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+)
-src_configure() {
-
+multilib_src_configure() {
# Generation of docs does no longer work. Hard disable it.
export ac_cv_prog_lash_texi2html="no"
local myeconfargs=(
$(use_enable debug)
- $(use_with alsa)
- $(use_with gtk gtk2)
- $(use_with python)
+ $(multilib_native_use_with alsa)
+ $(multilib_native_use_with gtk gtk2)
+ $(multilib_native_use_with python)
)
+
autotools-utils_src_configure
}
-src_install() {
+multilib_src_compile() {
+ autotools-utils_src_compile
+}
+
+multilib_src_install() {
autotools-utils_src_install
+}
+
+multilib_src_install_all() {
python_fix_shebang "${ED}"
+ use python && python_optimize
}
-pkg_postinst(){
+pkg_postinst() {
if [ ! $(grep -q ^lash /etc/services) ] || [ $(grep -q ^ladcca /etc/services) ] ; then
# cleanup trailing blank lines in /etc/service
sed -i -e :a -e '/^\n*$/{$d;N;};/\n$/ba' /etc/services
@@ -73,7 +89,7 @@
fi
}
-pkg_postrm(){
+pkg_postrm() {
# cleanup /etc/services
if grep -q ^lash /etc/services; then
einfo "cleaning lash entries frome /etc/services"
@@ -81,6 +97,4 @@
fi
# cleanup trailing blank lines in /etc/service
sed -i -e :a -e '/^\n*$/{$d;N;};/\n$/ba' /etc/services
- einfo "if programs which use lash fails try:"
- einfo "revdep-rebuild --library="liblash.so.*""
}