Version bump (fixes bug #313033). Add oil, osc, and static-libs USE flags, fix documentation install (bug #299097, thanks to Christophe LEFEBVRE), and improve python support (bug #313945).

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

5 files changed, 192 insertions, 6 deletions

diff --git a/media-sound/ecasound/ChangeLog b/media-sound/ecasound/ChangeLog
index b3e6bcbc3a99..ed2a61472383 100644
--- a/media-sound/ecasound/ChangeLog
+++ b/media-sound/ecasound/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/ecasound
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ChangeLog,v 1.58 2010/06/23 14:19:23 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ChangeLog,v 1.59 2011/06/28 04:21:12 radhermit Exp $
+
+*ecasound-2.8.1 (28 Jun 2011)
+
+  28 Jun 2011; Tim Harder <radhermit@gentoo.org> +ecasound-2.8.1.ebuild,
+  +files/ecasound-2.8.1-ldflags.patch, metadata.xml:
+  Version bump (fixes bug #313033). Add oil, osc, and static-libs USE flags,
+  fix documentation install (bug #299097, thanks to Christophe LEFEBVRE), and
+  improve python support (bug #313945).
 
   23 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   ecasound-2.6.0.ebuild:
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 5520c6748b5c..976f75358fe9 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,4 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ecasound-2.8.1-ldflags.patch 2715 RMD160 6435d650581eebbdd75d34dd1830f18e2c2cf2e9 SHA1 8e674482b1237ab6cdeaf75a371a709c239fac02 SHA256 79267748a8954eaf37b332033f7ee8e2a85113cde5ce17afae153c7e7b39381a
 DIST ecasound-2.6.0.tar.gz 966629 RMD160 25ca71ff8f270ee871cb3f86f9e79e22b866d0cc SHA1 fb34fd31d112a4a1d3e1a87f302324152f62eac7 SHA256 925d12a422883c356565c542110d070f61c3693e01eaa1b00eb25082e4779f88
+DIST ecasound-2.8.1.tar.gz 1056331 RMD160 f4b86264e43d2ae7b7bedb7cd75955125a1aa227 SHA1 55c42a611ce59ea2b92461f49358a0cd54c40fe0 SHA256 e55accabeaf5cc5dcaac56cdb83dabb908ad1195d79c2a3df7718b834d328994
 EBUILD ecasound-2.6.0.ebuild 1986 RMD160 7023a822540f28541bfcec11cbbf367975c708c7 SHA1 00e300f0c4f0e496d4d82c69c84cc4a4a44a080f SHA256 7c058280743ccf2a24042c128238599e00f2d9b1b4f930aa0661bbf8f465d2ee
-MISC ChangeLog 8910 RMD160 a014f8d15ee72c22cf5a6c6249aa1f6e13de03f8 SHA1 ef8d428e50426ba1abaa67c6634ea720b4d7d4e6 SHA256 1ac82d95e931a713f6f8d451152f180bf650bd44e0c96b1e20661b1c0258cae8
-MISC metadata.xml 756 RMD160 6d3c33eeed4fd27e66efc39cef9df6e4f6c0c85c SHA1 ad6acbd92059cb3a42c63831bea1cca257918199 SHA256 1f0d3106e16d53e9dc59cbb3c5859e07d8381231e7eb0812eb6bf971e99aa37c
+EBUILD ecasound-2.8.1.ebuild 2448 RMD160 09b4c46f04bfe60a6bb1eda508b3535244c818b4 SHA1 e26a69bd738af4120a57486cf5b506fe20358122 SHA256 0cf2a92515f42dbbf5dbaf897a8f95786956e17cca135f4bb92e3ec70125d4b3
+MISC ChangeLog 9264 RMD160 91d19577e935daa6d726e688de2a0ee0562df568 SHA1 21c9b3d7dac36eef9ecfab06515a54a36ae5a7cf SHA256 10ce167520387fa73ae62155851578ec0e665b641b119720c45857d83627cd52
+MISC metadata.xml 852 RMD160 6dd5dda6e3e077329238b8875e6bf633cc5461a3 SHA1 be9d17b3ccfb079dc8eb2c7fdc3dc3f5dce446f6 SHA256 3553a8dac2d2090a5e2c54d1f76907291207c0ff59a21db50799ecbca422ce12
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJOCVbBAAoJEEqz6FtPBkyjRlIH/064M6jfDRIn7Yla0itu0eN4
+VaA1CZ4zqvjHIRm/YfKAPR3fd9EtUK4N04wbvj2H0yUou+9udaXqFDnjoJXTwvn7
+LfUBLkwhxWws6vbPkEnhSwcK8F07SaWN0qEKFfopOWlPu/PrJaW/q2n+3NdJ5k8I
+zb/P8R5B6cF/QWfFsAqT//ojuOK5fz89zIJbvJaIBt/VjZnaKYS3NVjxzleNoQOy
+ZdWQcNOK/YtYPFIeZOoasMpDOl4hJZ3QAc1orkm1J3LZxvGolFmAg2uYgZagwrXa
+QELtuFNq0cbqZUcagSw1w46Kk900V2SMS4h+o3oASJp/VI2QpGpg73OD4LLdqnU=
+=V7kj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ecasound/ecasound-2.8.1.ebuild b/media-sound/ecasound/ecasound-2.8.1.ebuild
new file mode 100644
index 000000000000..804d3392c924
--- /dev/null
+++ b/media-sound/ecasound/ecasound-2.8.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.8.1.ebuild,v 1.1 2011/06/28 04:21:12 radhermit Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2"
+
+inherit eutils python autotools
+
+DESCRIPTION="a package for multitrack audio processing"
+HOMEPAGE="http://ecasound.seul.org/ecasound"
+SRC_URI="http://${PN}.seul.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa audiofile debug doc jack libsamplerate mikmod ncurses oil osc oss
+python ruby sndfile static-libs"
+
+RDEPEND="sys-libs/readline
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	media-libs/ladspa-sdk
+	mikmod? ( media-libs/libmikmod )
+	ncurses? ( sys-libs/ncurses )
+	oil? ( dev-libs/liboil )
+	osc? ( media-libs/liblo )
+	ruby? ( dev-lang/ruby )
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	use python && sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
+		pyecasound/Makefile.am || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local pyconf
+
+	if use python ; then
+		pyconf="--enable-pyecasound=c
+			--with-python-includes=$(python_get_includedir)
+			--with-python-modules=$(python_get_libdir)"
+	else
+		pyconf="--disable-pyecasound"
+	fi
+
+	econf \
+		--disable-arts \
+		--enable-shared \
+		--enable-sys-readline \
+		--with-largefile \
+		$(use_enable alsa) \
+		$(use_enable audiofile) \
+		$(use_enable debug) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate) \
+		$(use_enable ncurses) \
+		$(use_enable oil liboil) \
+		$(use_enable osc liblo) \
+		$(use_enable oss) \
+		$(use_enable ruby rubyecasound) \
+		$(use_enable sndfile) \
+		$(use_enable static-libs static) \
+		${pyconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS NEWS README TODO || die
+
+	if use doc ; then
+		dohtml Documentation/*.html || die
+		dodoc Documentation/programmers_guide/ecasound_programmers_guide.txt || die
+	fi
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f '{}' +
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ecacontrol.py eci.py pyeca.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ecacontrol.py eci.py pyeca.py
+}
diff --git a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
new file mode 100644
index 000000000000..8dca486f06e1
--- /dev/null
+++ b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
@@ -0,0 +1,64 @@
+--- ecasound-2.8.1.orig/kvutils/Makefile.am
++++ ecasound-2.8.1/kvutils/Makefile.am
+@@ -56,13 +56,12 @@
+ 			kvu_value_queue.h
+ 
+ libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
+-libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static
++libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@
+ 
+ libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
+ libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
+ 
+ libkvutils_tester_SOURCES = libkvutils_tester.cpp
+-libkvutils_tester_LDFLAGS = -static
+ libkvutils_tester_LDADD = $(lib_LTLIBRARIES)
+ 
+ noinst_HEADERS = $(kvutil_headers)
+--- ecasound-2.8.1.orig/libecasound/Makefile.am
++++ ecasound-2.8.1/libecasound/Makefile.am
+@@ -364,7 +364,7 @@
+ 
+ libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
+ libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
+-libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
++libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags)
+ libecasound_la_LIBADD = $(eca_libadd)
+ libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
+ libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
+--- ecasound-2.8.1.orig/libecasound/plugins/Makefile.am
++++ ecasound-2.8.1/libecasound/plugins/Makefile.am
+@@ -105,7 +105,7 @@
+ libecasound_plugins_la_SOURCES          = audioio_dummy.cpp $(plugin_cond_sources)
+ EXTRA_libecasound_plugins_la_SOURCES    = $(plugin_all_sources)
+ libecasound_plugins_la_LIBADD		= $(ECA_S_EXTRA_LIBS)
+-libecasound_plugins_la_LDFLAGS 		= -static
++libecasound_plugins_la_LDFLAGS 		=
+ 
+ libecasound_plugins_debug_la_SOURCES	= $(libecasound_plugins_la_SOURCES)
+ EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
+--- ecasound-2.8.1.orig/libecasoundc/Makefile.am
++++ ecasound-2.8.1/libecasoundc/Makefile.am
+@@ -14,9 +14,9 @@
+ # !!!
+ # remember to update eca-version.cpp
+ if ECA_AM_DEBUG_MODE
+-eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
++eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
+ else
+-eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
++eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
+ endif
+ 
+ INCLUDES = -I$(srcdir)
+--- ecasound-2.8.1.orig/pyecasound/Makefile.am
++++ ecasound-2.8.1/pyecasound/Makefile.am
+@@ -28,7 +28,7 @@
+ 				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py
+ endif
+ if ECA_AM_PYECASOUND_CEXT
+-pyecasound_install_list2 = 	pyecasound.so
++pyecasound_install_list2 = 	.libs/pyecasound.so
+ pyecasound_uninstall_list2 =   	$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so
+ endif
+ 
diff --git a/media-sound/ecasound/metadata.xml b/media-sound/ecasound/metadata.xml
index c6ec72ab04ff..44fa6c3beecb 100644
--- a/media-sound/ecasound/metadata.xml
+++ b/media-sound/ecasound/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>proaudio</herd>
-
 <longdescription>
 	Ecasound is a software package designed for multitrack audio 
 	processing. It can be used for simple tasks like audio playback,
@@ -14,5 +13,7 @@
 	objects like oscillators and MIDI-CCs. A versatile console mode 
 	user-interface is included in the package.
 </longdescription>
-
+<use>
+	<flag name="oil">Use <pkg>dev-libs/liboil</pkg> for inner loop optimizations</flag>
+</use>
 </pkgmetadata>