[proaudio] [2374] Import of ladish from the ladi overlay with some modifications in order to not break existing packages : updated the depends, renamed media-sound/lash to media-sound/ lash-original

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 2374
Author:   dominique
Date:     2012-12-28 21:42:48 +0100 (Fri, 28 Dec 2012)
Log Message:
-----------
Import of ladish from the ladi overlay with some modifications in order to not break existing packages: updated the depends, renamed media-sound/lash to media-sound/lash-original

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/lash/ChangeLog
    trunk/overlays/proaudio/media-sound/lash/Manifest
    trunk/overlays/proaudio/virtual/liblash/ChangeLog
    trunk/overlays/proaudio/virtual/liblash/Manifest
    trunk/overlays/proaudio/virtual/liblash/metadata.xml

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/ladish/
    trunk/overlays/proaudio/media-sound/ladish/ChangeLog
    trunk/overlays/proaudio/media-sound/ladish/Manifest
    trunk/overlays/proaudio/media-sound/ladish/files/
    trunk/overlays/proaudio/media-sound/ladish/files/fixwarnings.patch
    trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-include.patch
    trunk/overlays/proaudio/media-sound/ladish/ladish-1.ebuild
    trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild
    trunk/overlays/proaudio/media-sound/ladish/metadata.xml
    trunk/overlays/proaudio/media-sound/lash/lash-9998.ebuild
    trunk/overlays/proaudio/media-sound/lash-original/
    trunk/overlays/proaudio/media-sound/lash-original/ChangeLog
    trunk/overlays/proaudio/media-sound/lash-original/Manifest
    trunk/overlays/proaudio/media-sound/lash-original/files/
    trunk/overlays/proaudio/media-sound/lash-original/files/lash-0.6.0_rc2-texi2html.diff
    trunk/overlays/proaudio/media-sound/lash-original/lash-original-0.6.0_rc2.ebuild
    trunk/overlays/proaudio/media-sound/lash-original/metadata.xml
    trunk/overlays/proaudio/virtual/liblash/liblash-1.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/lash/files/
    trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2.ebuild
    trunk/overlays/proaudio/virtual/liblash/liblash-0.ebuild

Added: trunk/overlays/proaudio/media-sound/ladish/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/ChangeLog	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/ChangeLog	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,22 @@
+# ChangeLog for media-sound/ladish
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  28 Dec 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  Imported ladish-1.ebuild and ladish-9999.ebuild from the ladi overlay
+
+  08 Dec 2012; Karl Lindén <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  ladish-1.ebuild, ladish-9999.ebuild:
+  Added python fixes and an additional python USE flag
+  Updated some dependencies
+  Updated EAPI
+  Updated copyright notice
+
+  10 Oct 2011; Maxim Kachur <mcdebugger@xxxxxxxxxx>
+  ladish-9999.ebuild:
+  update dependencies
+  we shouldn't require =x11-libs/flowcanvas-9999 at this time cause ladish will not work with it
+  ladish depends on >=x11-libs/gtk+-2.20.0 (took from waf script)
+
+  28 Dec 2008; Marc-Olivier Barre <marco@xxxxxxxxxxxxxxxx>
+  ladish-9999.ebuild: add some more precise dependencies to make gladish work

Added: trunk/overlays/proaudio/media-sound/ladish/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/Manifest	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/Manifest	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,7 @@
+AUX fixwarnings.patch 862 SHA256 ff2bbe986fdf345e40d26ecc28e8246de40bbc0299a1e81873e15dca46499104 SHA512 34c9efbd32cdf88415f1c6d687636ae7ba62b3dc5b63096e57a2b19c33756157f2039e5ba7e5985a8ec6626f9b2a8e242808c968e5796bae8ffd77375e75c860 WHIRLPOOL b0590cd5d62c2a5b013579497c227915f492da5b3e766cb021d0b20f3dfd83ddb9796f718792322fe19d6b6e06c964049944cb4fc906e705b11c17d11d7c4a2d
+AUX ladish-1-include.patch 633 SHA256 8d0ebc16fd8bcdeac11d0ecb8c9c3f77822b199e9e27eb883a926952e1aebb0b SHA512 4ef6d5c19d2d570d518a4491ead5e074838d33604c13402ff0608a36bb1e4476e3294f31a644bb8700c62d2c4d73bd0fe15fff2a93e4c2b53e1ed771710d6a98 WHIRLPOOL 4642d387b91e57eadbbf3a728b6ee7e47d66ddab5d3035fe20392ef563c99d08fb5a094dd4456f6933433c0335250c5b774cac1879ccaa5df46a134d1a0bb5f0
+DIST ladish-1.tar.bz2 599209 SHA256 71065961f949f472cba50b6181b184d196d59332f6e9106403a37955906776d4 SHA512 10b321021d35655c94ef8558b32a24a650f298d97a05d5cb8119c3ee6a53059ba4a089af6c4bcc0fa5e4d6e112ced771b385e1eccc429a0b348437706c2f1c2b WHIRLPOOL ae2a4ffd8c39506b119a21e164a8cd1065a870abe4aca0019fb0387d705262dc49698950f10657c3497f62e99b52c0a277d57f188c845d8bf0c4954520844f34
+EBUILD ladish-1.ebuild 1429 SHA256 746909183f144934a9baea4fd3cf7c828044977e3a2376ed5792f836f9d6ce9c SHA512 37d51f4622925f344372e6dd90e5204f4cee91016a83b297ff1c6e987d1966fd40c516ac0df74d93be847315f7d17a9cf14a045aaabae814f3b96242088b57fe WHIRLPOOL 0d6fcdd0c4b9086074663bd84753a29b65a2c6c66db6aca93c99aa7ee574ce710dc7ca0aca9dd612a1e41f45500981b27b24afaef388296e14a69a79dd51c0ec
+EBUILD ladish-9999.ebuild 1319 SHA256 3ecb31799269797f1ad6d96c0fc830277fbf62d75d5245e9d82728c57e7c43e9 SHA512 500529f02aea0ac9eb898808001e96955c9393c06dd1749d3a69915b7523a66633f78f518253094ce54036fd5dfbf676e3d49c8ccdb7665a451a5da07170b5d7 WHIRLPOOL 51d8b986042fcd89eea80a933b6fe055bd1bef1a882e70c58d56184d011d5e94514da047fa6f0f5b5656f6479a15e81c9e5bda8a58e44c0bf70d254e0c80bc30
+MISC ChangeLog 878 SHA256 18cab2000ff7782203e0d8eb9b19620ded88235197ae99f49d1a7b89115a67e8 SHA512 55e4820452ec5b10721d6696945d8c7315551b174d1f070bea8ff4ee87deb9f02906363c269a31fd6a3e56d9330193189bbb81efeb7bb79001e6b603a86f7820 WHIRLPOOL 732b17ccd127ebb213076d96610b2480c26c1ba6d7d361e024547a9196a3a4c46853808b9a9b0453823fbc4215e1bbb214eed351ec21938fea88ca75079e17d3
+MISC metadata.xml 548 SHA256 c4aeda7c00505448bfa4aee5c7108e0a5d7cc40b92850e2c3c92222869af0f39 SHA512 8bf27c0e0959195356691b0a5e16168b2bc8bf777e00201e4c85c7ca66c08aa52811c436f5204465716679183bafadf5b803195fb017835d8de4da28d86e1667 WHIRLPOOL 7cd4db8d4fdaab26c22b08cd0c27fed554aee28ca9626e486cf8e53d6be43f8b5027b00fc90d19c85fe885f17877e5458c591631d823ff347044ff2d03feaaef

Added: trunk/overlays/proaudio/media-sound/ladish/files/fixwarnings.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/files/fixwarnings.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/files/fixwarnings.patch	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,25 @@
+diff -ru ladish-0.1.orig/daemon/studio.c ladish-0.1/daemon/studio.c
+--- ladish-0.1.orig/daemon/studio.c	2009-08-31 04:17:50.000000000 +0300
++++ ladish-0.1/daemon/studio.c	2009-11-20 01:59:08.000000000 +0200
+@@ -872,7 +872,7 @@
+   char * p;
+   const char * src;
+   char * filename_ptr;
+-  char * backup_filename_ptr;
++  char * backup_filename_ptr = NULL;
+ 
+   len_dir = strlen(g_studios_dir);
+ 
+Only in ladish-0.1/daemon: studio.c~
+diff -ru ladish-0.1.orig/jack_proxy.c ladish-0.1/jack_proxy.c
+--- ladish-0.1.orig/jack_proxy.c	2009-08-27 23:01:58.000000000 +0300
++++ ladish-0.1/jack_proxy.c	2009-11-20 01:58:36.000000000 +0200
+@@ -585,7 +585,7 @@
+     value_ptr = &boolean;
+     break;
+   default:
+-    lash_error("Unknown jack parameter type %i", (int)type);
++    lash_error("Unknown jack parameter type %i", (int)parameter_ptr->type);
+     return false;
+   }
+ 

Added: trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-include.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-include.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-include.patch	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,25 @@
+From a2a17cd39220e2013d3402b06a53f5a46492aa00 Mon Sep 17 00:00:00 2001
+From: Nedko Arnaudov <nedko@xxxxxxxxxxxxx>
+Date: Sun, 7 Oct 2012 14:06:04 +0300
+Subject: [PATCH] add includes for getrlimit
+
+---
+ daemon/loader.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/daemon/loader.c b/daemon/loader.c
+index b9fe6f1..37fb94f 100644
+--- a/daemon/loader.c
++++ b/daemon/loader.c
+@@ -34,6 +34,8 @@
+ #include <fcntl.h>
+ #include <pty.h>                /* forkpty() */
+ #include <sys/wait.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ 
+ #include "loader.h"
+ #include "../proxies/conf_proxy.h"
+-- 
+1.6.5.GIT
+

Added: trunk/overlays/proaudio/media-sound/ladish/ladish-1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/ladish-1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/ladish-1.ebuild	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_DEPEND="2"
+
+inherit eutils python
+
+DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
+HOMEPAGE="http://ladish.org/";
+SRC_URI="http://ladish.org/download/ladish-${PV}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="lash python"
+
+RDEPEND="!media-libs/lash
+	media-sound/jack-audio-connection-kit[dbus]
+	>=x11-libs/flowcanvas-0.6.4
+	sys-apps/dbus
+	>=dev-libs/glib-2.20.3
+	>=x11-libs/gtk+-2.20.0
+	>=gnome-base/libglade-2.6.2
+	>=dev-libs/dbus-glib-0.74
+	dev-lang/python
+	>=dev-libs/expat-2.0.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-include.patch"
+}
+
+src_configure() {
+	python_convert_shebangs -r 2 "${S}"
+	local myconf="--prefix=/usr --destdir=${D}"
+	use lash && myconf="${myconf} --enable-liblash"
+	use python && myconf="${myconf} --enable-pylash"
+	einfo "Running \"./waf configure ${myconf}\" ..."
+	./waf configure ${myconf} || die "waf configure failed"
+}
+
+src_compile() {
+	einfo "Running \"./waf build\""
+	./waf build || die "failed to build"
+}
+
+src_install() {
+	einfo "Running \"./waf install --destdir=${ED}"
+	./waf install --destdir="${ED}" || die "install failed"
+	dodoc AUTHORS README NEWS
+	python_convert_shebangs -r 2 "${ED}"
+}

Added: trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_DEPEND="2"
+
+inherit eutils git-2 python
+
+DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
+HOMEPAGE="http://ladish.org/";
+EGIT_REPO_URI="git://repo.or.cz/ladish.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="lash python"
+
+RDEPEND="!media-libs/lash
+	media-sound/jack-audio-connection-kit[dbus]
+	>=x11-libs/flowcanvas-0.6.4
+	sys-apps/dbus
+	>=dev-libs/glib-2.20.3
+	>=x11-libs/gtk+-2.20.0
+	>=gnome-base/libglade-2.6.2
+	>=dev-libs/dbus-glib-0.74
+	dev-lang/python
+	>=dev-libs/expat-2.0.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	python_convert_shebangs -r 2 "${S}"
+	local myconf="--prefix=/usr --destdir=${D}"
+	use lash && myconf="${myconf} --enable-liblash"
+	use python && myconf="${myconf} --enable-pylash"
+	einfo "Running \"./waf configure ${myconf}\" ..."
+	./waf configure ${myconf} || die "waf configure failed"
+}
+
+src_compile() {
+	./waf build || die "failed to build"
+}
+
+src_install() {
+	einfo "Running \"./waf install --destdir=${ED}"
+	./waf install --destdir="${ED}" || die "install failed"
+	dodoc AUTHORS README NEWS
+	python_convert_shebangs -r 2 "${ED}"
+}

Added: trunk/overlays/proaudio/media-sound/ladish/metadata.xml
===================================================================
(Binary files differ)


Property changes on: trunk/overlays/proaudio/media-sound/ladish/metadata.xml
___________________________________________________________________
Added: svn:mime-type
   + application/xml

Modified: trunk/overlays/proaudio/media-sound/lash/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/ChangeLog	2012-12-28 17:37:38 UTC (rev 2373)
+++ trunk/overlays/proaudio/media-sound/lash/ChangeLog	2012-12-28 20:42:48 UTC (rev 2374)
@@ -2,6 +2,15 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Dec 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  -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.
+  All new ebuilds should depend on virtual/liblash instead of media-sound/lash.
+
   11 Nov 2012; Karl Lindén <spray.sucks@xxxxxxxxx>;
   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	2012-12-28 17:37:38 UTC (rev 2373)
+++ trunk/overlays/proaudio/media-sound/lash/Manifest	2012-12-28 20:42:48 UTC (rev 2374)
@@ -1,5 +1,3 @@
-AUX lash-0.6.0_rc2-texi2html.diff 2054 SHA256 40d76da366d8f82f3ff060d896fd3a682f7f443648313f309b6327cfe6dd0cee SHA512 07a5b0815a86805db2a18f3fa5caf454e3a45b9f45f71678605c6accfc40ce0e3299bf64e64dfcf4a72ee344fd3956e269560684eedfaf6ea6ef8994726587ce WHIRLPOOL 2c21beedfb0ebf07eefa7b75868e96a33d5a30fa8b40ac00d4348b74ebb871155550a5c9cfd73a3c0899fe9c8979c31b2eec7f996a9c3ae9691c80c094cdfb9a
-DIST lash-0.6.0~rc2.tar.bz2 431891 SHA256 3c1eb2bd88e1a0722dea5c24be4ede1d80848c963d41751973fae73c47dfe18b SHA512 704e24ccadccb469e820be5fb58dd4d953a8fc2903cd857a290267a87dda596639ec381d5cb7cdfcd715df7d98d6570e52731bddd17f8a3425edd8b699632401 WHIRLPOOL b6de62365af169e61a0d93a73366dca7d2be4aa759ddc3da16d02c0a0aba05c549e237a73b0ec3b7ac8ed258cf846d6cd699940cf73127cdec404107371523a3
-EBUILD lash-0.6.0_rc2.ebuild 2181 SHA256 06e696eb002954bedb6d1f352acd7b7c6de0515b4d9e3eea62ed1f53bfa50de8 SHA512 d26f239892750402e2bdb89ac91548f71e407e4e954d0a0ba418d28615d7ebc74901ce6c699638286c2e0b76e4c074883f2a90795bf0e1c98ea0a6703d21f848 WHIRLPOOL 4f75d9335bd9da4bcea48a600568ef410159afcf586cf9d5815b1af49465c3243945e33ce62fd929beb86f3ec28db572380bace823ac05d1a9e34ab299e60d29
-MISC ChangeLog 1025 SHA256 6b91f742afb40b0bb77c3510f5971c7db13c3f238ff8ea1c1a2a1fd810bb4cb3 SHA512 9e4422a26f424a3f32dde145b22f734212f4d2dffa7fb4dec9c9e8808f97cf8720b4039e97c91632062907373e9c3c32240e3cdcf89a6f64155f5a344b4b76a6 WHIRLPOOL d3a20550cd4592413bddc2eeb2b0d0ed8e1375b0a2401b4c32ab5c2f11ae900e9e7ca7b7b1288fdd2cd836ccc772e861453337af23d64f2ab1c4fcde512b2a25
+EBUILD lash-9998.ebuild 392 SHA256 dc46133dbb9fb215447387804cdc965eeb2dfd9b3408c3190179a5c208243c52 SHA512 ae0057f8996596c44aabb459812f3b27ab11ea35789c8f68bb2ca4349131b111bbfec6c8874ff5712e185ddf25d9e9f4c71dacc7c366b738bdbd58fc50462f0a WHIRLPOOL e34af2a9350279061554cdef3fe421dab421e29c0da0b126f1f4e969a6218084f653b15f3870f1b432c339d2415f4cf1ebda1c309b7c77ef7230a786c3b394fd
+MISC ChangeLog 1557 SHA256 af32f9c2ec06a5a5bbbe26da9707416d601ffcc959b9e63886c8f79320ead1b4 SHA512 341758971d09c96a2f9463fe285a8a033df25db3d0afd4e609a8259b65980ad092afa98bcb42db0af2944c0b0fe7c64f40b4b4a0a2dacd8daa69916455fb347e WHIRLPOOL 18e877f390a2cbd7acb225a35f868095037fb1fd3c3c142144645ec2493104ef9dac265c9ccf6a657375b8fa5d9124fa2ef602c9d817515fc1028c2c0f41c8f3
 MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Deleted: trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2.ebuild	2012-12-28 17:37:38 UTC (rev 2373)
+++ trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2.ebuild	2012-12-28 20:42:48 UTC (rev 2374)
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils python
-
-MY_P="${P/_/~}"
-
-DESCRIPTION="LASH Audio Session Handler"
-HOMEPAGE="http://www.nongnu.org/lash/";
-SRC_URI="http://download.savannah.gnu.org/releases/lash/${MY_P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="alsa debug gtk python"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	media-sound/jack-audio-connection-kit
-	dev-libs/libxml2
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	python? ( dev-lang/python )
-	|| ( sys-libs/readline dev-libs/libedit )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	python? ( >=dev-lang/swig-1.3.31 )"
-
-S="${WORKDIR}/${PN}-0.6.0.594"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-texi2html.diff" || die "conf patch failed"
-}
-
-src_configure() {
-	local myconf
-
-	# Yet-another-broken-configure: --enable-pylash would disable it.
-	use python || myconf="${myconf} --disable-pylash"
-
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable gtk gtk2) \
-		$(use_enable debug) \
-		${myconf} \
-		--disable-serv-inst \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	python_convert_shebangs -r 2 "${ED}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-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
-	einfo "if programs which use lash fails try:"
-	einfo "revdep-rebuild --library="liblash.so.*""
-}

Added: trunk/overlays/proaudio/media-sound/lash/lash-9998.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/lash-9998.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/lash/lash-9998.ebuild	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Temporary wrapper for liblas (lash) and ladish"
+HOMEPAGE="http://proaudio.tuxfamily.org";
+SRC_URI=""
+
+LICENSE=""
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="ladish"
+
+RDEPEND="ladish? ( media-sound/ladish )
+	!ladish? ( media-sound/lash-original )"
+DEPEND="${RDEPEND}"

Added: trunk/overlays/proaudio/media-sound/lash-original/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/ChangeLog	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/lash-original/ChangeLog	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,35 @@
+# ChangeLog for media-sound/lash-original
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  27 Dec 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  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.sucks@xxxxxxxxx>;
+  lash-0.6.0_rc2.ebuild: added python_convert_shebangs to ebuild
+
+  03 Jun 2012; Hakan Demiralp (keenblade) <keenblade@xxxxxxxxxxxxx>
+  lash-0.6.0_rc2.ebuild, +files/lash-0.6.0_rc2-texi2html.diff:
+  lash-0.6.0_rc2: added new patch lash-0.6.0_rc2-texi2html.diff wrt texi2htm
+  bug by wol. removed old ebuild and patch
+
+  04 Aug 2009; Dominique Michel <dominique@xxxxxxxxxxxxx>;
+  Removed midi USE check from alsa-lib depend
+
+  09 Aug 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>; lash-0.5.4.ebuild,
+  +files/lash-0.5.4-glibc2.8.patch:
+  KEEP -- imho better /etc/service cleanup handling
+
+  13 Jan 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> lash-0.5.4.ebuild:
+  add useflags
+
+  13 Jan 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
+  +lash-0.5.4.ebuild:
+  bump
+
+  17 Dec 2007; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> ChangeLog:
+  added a changelog
+

Added: trunk/overlays/proaudio/media-sound/lash-original/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/Manifest	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/lash-original/Manifest	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,5 @@
+AUX lash-0.6.0_rc2-texi2html.diff 2054 SHA256 40d76da366d8f82f3ff060d896fd3a682f7f443648313f309b6327cfe6dd0cee SHA512 07a5b0815a86805db2a18f3fa5caf454e3a45b9f45f71678605c6accfc40ce0e3299bf64e64dfcf4a72ee344fd3956e269560684eedfaf6ea6ef8994726587ce WHIRLPOOL 2c21beedfb0ebf07eefa7b75868e96a33d5a30fa8b40ac00d4348b74ebb871155550a5c9cfd73a3c0899fe9c8979c31b2eec7f996a9c3ae9691c80c094cdfb9a
+DIST lash-0.6.0~rc2.tar.bz2 431891 SHA256 3c1eb2bd88e1a0722dea5c24be4ede1d80848c963d41751973fae73c47dfe18b SHA512 704e24ccadccb469e820be5fb58dd4d953a8fc2903cd857a290267a87dda596639ec381d5cb7cdfcd715df7d98d6570e52731bddd17f8a3425edd8b699632401 WHIRLPOOL b6de62365af169e61a0d93a73366dca7d2be4aa759ddc3da16d02c0a0aba05c549e237a73b0ec3b7ac8ed258cf846d6cd699940cf73127cdec404107371523a3
+EBUILD lash-original-0.6.0_rc2.ebuild 2246 SHA256 daa9bc43c0da040980586e16b14192a0ba3723900dda9825047eea633f17c652 SHA512 ebec68471041b4e9011f9b71555b832cb9fe2bc56827afe7b4e5b824cb2cb9e130d3094d6fd37afae91f521ca26ae312339de8d6aa4d1756374c1f9914118fe0 WHIRLPOOL 96f39c38e3a9942621af4282f4a38a3fc66fe932903aacbe8866e92fa7798fb6bb1043c01e67084553eca5a69552f7c0ae461c69ea9defa97d649769a3cbc6ec
+MISC ChangeLog 1320 SHA256 b7a4cdf04d5f4923c2e40a2a7957118d4ff0980300960016466deac8fab217c7 SHA512 2b717f0dcb7ae23e332bfabe6ebd57d3e09779cd67dded130d0e4b287f1e989b8ef522640fc775263a5679eb50409e66b56028826c9c2c0d7c0d7bf6c4d93c4a WHIRLPOOL 2d3f8c86e0d20b3289419fba1e004dc88fd30ebc2388d326f11442d77e0a91bd3741bdef94aa6fa39aaf0d8d422462881ddc3e679ba66fd75123416c1cc40ac9
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Added: 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	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/lash-original/files/lash-0.6.0_rc2-texi2html.diff	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,46 @@
+*** 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/lash-original-0.6.0_rc2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lash-original/lash-original-0.6.0_rc2.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/lash-original/lash-original-0.6.0_rc2.ebuild	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils python
+
+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/lash/${MY_P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa debug gtk python"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	media-sound/jack-audio-connection-kit
+	dev-libs/libxml2
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	python? ( dev-lang/python )
+	|| ( sys-libs/readline dev-libs/libedit )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-lang/swig-1.3.31 )"
+
+S="${WORKDIR}/${MY_PN}-0.6.0.594"
+
+src_prepare() {
+	epatch "${FILESDIR}/${MY_PN}-${PV}-texi2html.diff" || die "conf patch failed"
+}
+
+src_configure() {
+	local myconf
+
+	# Yet-another-broken-configure: --enable-pylash would disable it.
+	use python || myconf="${myconf} --disable-pylash"
+
+	econf \
+		$(use_enable alsa alsa-midi) \
+		$(use_enable gtk gtk2) \
+		$(use_enable debug) \
+		${myconf} \
+		--disable-serv-inst \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	python_convert_shebangs -r 2 "${ED}"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+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
+	einfo "if programs which use lash fails try:"
+	einfo "revdep-rebuild --library="liblash.so.*""
+}

Added: trunk/overlays/proaudio/media-sound/lash-original/metadata.xml
===================================================================
(Binary files differ)


Property changes on: trunk/overlays/proaudio/media-sound/lash-original/metadata.xml
___________________________________________________________________
Added: svn:mime-type
   + application/xml

Modified: trunk/overlays/proaudio/virtual/liblash/ChangeLog
===================================================================
--- trunk/overlays/proaudio/virtual/liblash/ChangeLog	2012-12-28 17:37:38 UTC (rev 2373)
+++ trunk/overlays/proaudio/virtual/liblash/ChangeLog	2012-12-28 20:42:48 UTC (rev 2374)
@@ -2,5 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Dec 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  -liblash-0.ebuild;
+  +liblash-2.ebuild: Changed the lash dependencies to lash-original
+
   13 Dec 2012; Karl Lindén <lilrc@xxxxxxxxxxxxxxxxxxxxx>
   Initial release

Modified: trunk/overlays/proaudio/virtual/liblash/Manifest
===================================================================
--- trunk/overlays/proaudio/virtual/liblash/Manifest	2012-12-28 17:37:38 UTC (rev 2373)
+++ trunk/overlays/proaudio/virtual/liblash/Manifest	2012-12-28 20:42:48 UTC (rev 2374)
@@ -1,3 +1,3 @@
-EBUILD liblash-0.ebuild 478 SHA256 360cd76a6af46f6045e63c578f92728a3456ad6fbff7cf673e3795162aa34bcf SHA512 f79009af04ed1fb97993952487a5694e887d4e7fd1db584c0b1ac9988a4761d49be4998303cd8aa363260863cfc89b76663a58eb2e33bf58c11d2c80fe0dab07 WHIRLPOOL a4b2818f5f172875535bc5dc2da38e822e0461447d0091bff046d0e69af4b8025a69de4217624ed0251e58157634b523691d9d6ca1a68eb465fad471282c806e
-MISC ChangeLog 192 SHA256 c3357a522730879dd23ecc0d0b7d17288e42217f739f747351cf8dc34069869e SHA512 c11092cba24c2125de7380425fdc7f37818fff41e752824bb0e81518904ed2cea72c5627381ceea937e0e1ad4910bf446dc43cf6f03a7e70fb47d2e910d6a022 WHIRLPOOL 166d9a9e4c71f00125a777269bb4d16ff938a072efe6834f38721d718513eb7c485b077e5f4f2e7c5653947db378d06ea6b34acb6900e49492e38b8484dcc1ac
-MISC metadata.xml 457 SHA256 f8afcca9daef3a6051d0f8eaccbe06426e6a6d862ac15c2bd625e0de60ffa469 SHA512 de304c08cadf51acdceed01669cca8a9dfddcb42ccf9de1b09906d836eaaf87ffedab394bbf49a32fdbc6766983ece8de5f9faa2c7a413f983814a8d00c3fda0 WHIRLPOOL 4562114633f384dcdd0cacd70070f585a2b38c1d69cf247ff77e4954678984a51c4dda81ad310d33a8769efafbc89a7d2e88c57adba2701d20e77776a4e3de4a
+EBUILD liblash-1.ebuild 496 SHA256 3eecc3593ad05d0f53974e29cbcc8d01165a16b097bff2c3a97a2e60783924e5 SHA512 5f0e2197201d276d1bbc962ed4cb870c738cfa9d3b5721982ea483f6f86ad2c54b358e6cdbd460ed85c103c653713ed4f3e8826ac67437d7d120ec5d3375d635 WHIRLPOOL 2af51d820a13ea214384b7f615da9c375c2097f797790a9a78bd00b346c69731b75b608cf6b67b259df67754ed4163ac79b18e1fd63f0af18dec6f7ba6164e12
+MISC ChangeLog 348 SHA256 6c86d9412427cd27247bba2bdadc6f6e4b16b7b2f01cf92b93b4df5559aaa8b7 SHA512 c2e62fe30511fd72887c22bb01ca8e7dd8f8fbf1ef5cf9c9929641b6b4f4ae945ce4b8334c54c4ef120cdf9b51ffcf9b01e81f1a3020229c1806800a9ca33e91 WHIRLPOOL 5fa01bb18393e2dd5fbe8145884f5ccf47c153ddaa9f5b754176da60fc10b159f63ea01e7afd3b5f7964e3adf00fc5326c528bbea886ab55bce0c60a442b3f6e
+MISC metadata.xml 252 SHA256 e33fef9ed5022ff237e9a7a1bfd6d804a38a323ac6507141808887e0d2787139 SHA512 a30cf56dcc5742013d2975f9d1a6b340fa54700848018442a242393c04b8a5ec3750d8fe4a0422c883171f2d8d557e550649aa48512dfd373857fb44c20d6fc6 WHIRLPOOL b842cdf63d3cea5f0909cbd8f6c56f685df66f09e09f971b190d880d7f19585d3f0ac0326d3b29639b5814dc89ba2374d63daf384614fbbb6d7fae2a876d1e3c

Deleted: trunk/overlays/proaudio/virtual/liblash/liblash-0.ebuild
===================================================================
--- trunk/overlays/proaudio/virtual/liblash/liblash-0.ebuild	2012-12-28 17:37:38 UTC (rev 2373)
+++ trunk/overlays/proaudio/virtual/liblash/liblash-0.ebuild	2012-12-28 20:42:48 UTC (rev 2374)
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/pager/pager-0.ebuild,v 1.3 2009/12/15 19:47:07 abcd Exp $
-
-EAPI="5"
-
-DESCRIPTION="Virtual for LASH library"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python"
-
-DEPEND=""
-RDEPEND="|| ( media-sound/lash media-sound/ladish[lash] )
-python? ( || ( media-sound/lash[python] media-sound/ladish[python] ) )"

Added: trunk/overlays/proaudio/virtual/liblash/liblash-1.ebuild
===================================================================
--- trunk/overlays/proaudio/virtual/liblash/liblash-1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/virtual/liblash/liblash-1.ebuild	2012-12-28 20:42:48 UTC (rev 2374)
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/pager/pager-0.ebuild,v 1.3 2009/12/15 19:47:07 abcd Exp $
+
+EAPI="5"
+
+DESCRIPTION="Virtual for LASH library"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="python"
+
+DEPEND=""
+RDEPEND="|| ( media-sound/lash-original media-sound/ladish[lash] )
+python? ( || ( media-sound/lash-original[python] media-sound/ladish[python] ) )"

Modified: trunk/overlays/proaudio/virtual/liblash/metadata.xml
===================================================================
(Binary files differ)


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/