| [proaudio] proaudio/proaudio: [3105] lash-original: various portage fixes |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3105
Author: dominique
Date: 2017-09-11 14:28:31 +0200 (Mon, 11 Sep 2017)
Log Message:
-----------
lash-original: various portage fixes
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/lash-original-0.6.0_rc2-r1.ebuild
trunk/overlays/proaudio/media-sound/lash-original/metadata.xml
Modified: trunk/overlays/proaudio/media-sound/lash-original/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/ChangeLog 2017-09-11 12:22:09 UTC (rev 3104)
+++ trunk/overlays/proaudio/media-sound/lash-original/ChangeLog 2017-09-11 12:28:31 UTC (rev 3105)
@@ -1,7 +1,10 @@
# ChangeLog for media-sound/lash-original
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+ 11 Dec 2017; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+ lash-original-0.6.0_rc2-r1.ebuild:
+ various fixes from portage
+
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,
Modified: trunk/overlays/proaudio/media-sound/lash-original/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/Manifest 2017-09-11 12:22:09 UTC (rev 3104)
+++ trunk/overlays/proaudio/media-sound/lash-original/Manifest 2017-09-11 12:28:31 UTC (rev 3105)
@@ -2,6 +2,6 @@
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 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
+EBUILD lash-original-0.6.0_rc2-r1.ebuild 2436 SHA256 8d234ea2c2730c645c3569b2a4aeb90a2c8916d3d4f37b4fb1aaf79c90b78b1d SHA512 5d3ffbfaf03806ab89fe5a62a398fcbc69b07ee40f8ba5523f1a31a3a30611538b75c07c8bdab01a2715dd8d007ba7f491323266ab5a7c3f448a1820950612c3 WHIRLPOOL c7413ea59ad426ecab7cc97f3db6e02864adf4d522d918b366f49bb27a84a15049afc01af9409e36b120ec62c0a3539f54617dc76914d2afe42594b4653272a2
+MISC ChangeLog 2683 SHA256 9b04a85d2a7f83128ac0fd68b6fa1154cb8684cbc024c5971f5866654ac73cbf SHA512 cd3ec60feff061c1d53fc9901b9c35e40362dec897a6e2f2c11b4eb9cf88ae3d5331b771de11276b22dd73606055ff567228a2cb2e121578efee00951a95ee4a WHIRLPOOL 459ff7aa4a8e7fb3687f3ca1b76f1ccf2eca801dbc4374b1307e71019d6e70c25e334c90fcbcad434e8628b7a8445ee33675c671b33ad7cd64934cbbdcffa5a0
+MISC metadata.xml 261 SHA256 3812db1cff66d287c945fc7987f7d2cb37fea10ad28fdae3b7277beb8cfe7392 SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1 WHIRLPOOL 539e44c7fa67fe66d40aea271af64a7da8cb15c7f990400572ea7372b6268575cf1bf1d536772276b8df4340a7919392d21120a7f7321d198a24460b3b383154
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 2017-09-11 12:22:09 UTC (rev 3104)
+++ trunk/overlays/proaudio/media-sound/lash-original/lash-original-0.6.0_rc2-r1.ebuild 2017-09-11 12:28:31 UTC (rev 3105)
@@ -1,14 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils eutils python-single-r1 multilib-minimal
-MY_PV="${PV/_/\~}"
+inherit autotools eutils python-single-r1 multilib-minimal
+
+MY_PV="${PV/_/~}"
MY_PN="${PN/-original/}"
MY_P="${MY_PN}-${MY_PV}"
@@ -20,18 +19,16 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa debug gtk python"
+IUSE="alsa debug gtk python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-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}]
+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 )"
+ || ( sys-libs/readline:* dev-libs/libedit )"
DEPEND="${RDEPEND}
virtual/pkgconfig
python? ( dev-lang/swig )"
@@ -44,57 +41,76 @@
"${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"
+ export ac_cv_prog_lash_texi2html="no" #422045
- local myeconfargs=(
- $(use_enable debug)
- $(multilib_native_use_with alsa)
- $(multilib_native_use_with gtk gtk2)
- $(multilib_native_use_with python)
- )
+ local myeconf=()
+ if ! multilib_is_native_abi || ! use python; then
+ myconf+=( --without-python )
+ fi
- autotools-utils_src_configure
+ 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() {
- autotools-utils_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() {
- autotools-utils_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() {
- python_fix_shebang "${ED}"
+ prune_libtool_files --all # --all for _lash.la in python directory
use python && python_optimize
}
-
-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
- # check for old ladcca entries and remove
- if grep -q ^ladcca /etc/services; then
- sed -i /ladcca/d /etc/services
- fi
- # add new lash entry
- if ! grep -q ^lash /etc/services ; then
- cat >>/etc/services<<-EOF
-
-lash 14541/tcp # LASH client/server protocol
-EOF
- fi
- fi
-}
-
-pkg_postrm() {
- # cleanup /etc/services
- if grep -q ^lash /etc/services; then
- einfo "cleaning lash entries frome /etc/services"
- sed -i /lash/d /etc/services
- fi
- # cleanup trailing blank lines in /etc/service
- sed -i -e :a -e '/^\n*$/{$d;N;};/\n$/ba' /etc/services
-}
Modified: trunk/overlays/proaudio/media-sound/lash-original/metadata.xml
===================================================================
(Binary files differ)