Version bump, thanks to Richard Ash <richard@audacityteam.org> for the notice and ebuild, bug #244360

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.3 x86_64

5 files changed, 139 insertions, 3 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 799a5f9265b0..fb4ff18617ba 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.107 2008/09/29 22:57:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.108 2008/10/26 11:45:26 aballier Exp $
+
+*audacity-1.3.6 (26 Oct 2008)
+
+  26 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/audacity-1.3.6-novorbis.patch, metadata.xml,
+  +audacity-1.3.6.ebuild:
+  Version bump, thanks to Richard Ash <richard@audacityteam.org> for the
+  notice and ebuild, bug #244360
 
   29 Sep 2008; Jeroen Roovers <jer@gentoo.org> audacity-1.3.5.ebuild:
   Stable for HPPA (bug #231497).
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 6fb2ad9f95aa..99bba9c15ef3 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,15 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CVE-2007-6061.patch 990 RMD160 65c960ffbad4ed21b56064fc44672da15a3a9a84 SHA1 4519a1b819feb77d6d49e22db1699dbad14a73f3 SHA256 45ef372a604d900ff9f40e7070525506fe63073cc4dd4edaf0fe7078d37df24d
 AUX audacity-1.3.4-automagic.patch 2625 RMD160 63f28b895aa94c2458cc3f16ed52f3a44f95c08b SHA1 908aba3830560e16678a35d9350e2f681c452bf9 SHA256 a992234a9219c266a4318ba0cfd23404d11dd0b1ebce587512996cdbc8fd4946
 AUX audacity-1.3.4-nolibfailure.patch 1565 RMD160 7d09b05176eee4ac0bee6f6832e472728ba890dd SHA1 18ebf966afa3569f34da8af53605fc4cf51d833f SHA256 25fce83269210c1ce446b01969fd65e980ddcfd3b489218a3e9e3d16d4025e62
 AUX audacity-1.3.5-cflags_with_non_standard_macros.patch 1579 RMD160 a199800aacdf96b22e52654f9ed29325272771e9 SHA1 bbb3b6f33cecfd9b9bd64f137fca5e5154f699ba SHA256 63fb54b58de9a2523495a2eb7e62362450665fdaf5b6be85a3d3717fadf29385
 AUX audacity-1.3.5-libtool22.patch 621 RMD160 9c8b46928a8dd2d1750163570fa9a36abb44212a SHA1 c1fb708d251331670a881bb3196baf21bfc5bee7 SHA256 c8f25696de80da8f41224be44c630c288e7a94290bb0d86fef6709e0d1923f67
 AUX audacity-1.3.5-novorbis.patch 484 RMD160 cc6416c4ae82d557dc33291911b9826a13313881 SHA1 93c336118eb29eeb09175574f6ef37006f620869 SHA256 34045eb10d9f2d724c4f9c8ed8f33fc57354f73a10531713f9fdff40269f7cb1
+AUX audacity-1.3.6-novorbis.patch 469 RMD160 d7fec0a0447821c6f1d755341b35e1574cff376a SHA1 5a0cc57de7b244d8d66127743e43cee53f5ffb02 SHA256 c00b173468876b4ad077c463a88391e9f82f44b4cc842d82a08234a46b3e7091
 DIST audacity-1.3.4-portaudio-cvs-rev1.7.patch.bz2 6235 RMD160 38e74622e7af4cf3662e87256ec38373eeb00595 SHA1 0a19a1e38d7ee552d75583a6e99e892b3cf4ab50 SHA256 ad78193aee772eb78e5a315d721b0f35242eb6f9b5e8f7d9e718d8a11e70b8a1
 DIST audacity-src-1.3.4.tar.bz2 4349381 RMD160 754d81fb0e660d697e7c315c41f28584917e0a9e SHA1 50ab6cf19545f8cb38226b96252dbd958e7d88c4 SHA256 102d60e48e1928f3fd995a214ed9ba872929c6365cf5f784f107f351b42499f9
 DIST audacity-src-1.3.5.tar.bz2 4542637 RMD160 f4d56d8ad88ad743c9ae04ee4abc3ded61674c5e SHA1 6ff24769fdef7bb0db7702eecb128f242fc85fce SHA256 58beaf20d5d4bdec61c93cc9bda08faea9b1c9b51c962b4176e9390a6a65904c
+DIST audacity-src-1.3.6.tar.bz2 4719800 RMD160 d89196725c9afe8b833ed5eca869d30329e33463 SHA1 d02edac1dafb0c6f6fb12d29505c63b72fb1b116 SHA256 a9224ab67abbe15d9fbe7655287a6e5fe98ab329d80ed7d42c8b588c6584da3e
 DIST pa_stable_v19_20071207.tar.gz 1113282 RMD160 5185bd85bd4bc75dddb3fa56f172a346bdeea0c7 SHA1 3841453bb7be672a15b6b632ade6f225eb0a4efc SHA256 06a17727d56d382a69036de2ed9aee9a15cac0329b995b8cfcd69b357f47bf2b
 EBUILD audacity-1.3.4-r3.ebuild 2954 RMD160 7d16f63e00fc0bc7d9155cdb77bcf5077a8893df SHA1 17c20c4ce1b6dc01148f5e3817421d41b6753fd3 SHA256 e6882880a70b72def3c0c8cccca19e752b49977a9be30a810b0d9b2282ff126a
 EBUILD audacity-1.3.5-r1.ebuild 2505 RMD160 ac191f01c4b976130d75068fe0c3e5aba40c3592 SHA1 877eede92a28ad4cc9dbae4733074990d35de94d SHA256 f8cd44cf94e8fac202b0cb75fd1f0943e4fe7e90f16864daca432ccd07b05e19
 EBUILD audacity-1.3.5.ebuild 2763 RMD160 758954ce92206219a781c9f35248668ec9095c7e SHA1 f607c2e1927526620ef4838863d2e1e1cef1798b SHA256 2cb9ce81ad5f8e898d872a96c0d93583b09c18df50f696765315f07613ca2fb5
-MISC ChangeLog 18529 RMD160 a689b07c576781850d0ea58e77f46cacf875c8e4 SHA1 c381df6e32210c813ebdbd945818aafe020beae5 SHA256 8a8d707d96ec21b3200775acf0a994a66bd4327fb04aab71eb122c15d0b036f4
-MISC metadata.xml 490 RMD160 1ae27603d1eafdd0f9bdc4e2002be5418c99500d SHA1 673ea9e78fefc9673bfa92e2e4fa1a67e8e341d0 SHA256 17751732431c3dbe605f12634e5b5e24a7baa188016be3271114934f1b8eb6cf
+EBUILD audacity-1.3.6.ebuild 2701 RMD160 ec4683c3e5e651e71241acdf66103311e81c5a56 SHA1 dadba0c9cfff83da724b4e1807b89b473724f158 SHA256 c201039467bc3592d976edc1d90fe5cefff3954ddb0e4245fb77ed4af97ff2fd
+MISC ChangeLog 18804 RMD160 038402ce9549dadb9fedc6cf7129f9bbb5e19101 SHA1 bb913eb71f23204762bfc02f747ec1943af1f536 SHA256 2cb7f476d306c8c93e6cc8fdd7cc4d4ccc4db49d176dfbadead08cc205b882ba
+MISC metadata.xml 540 RMD160 af87bf45a5fe6c0b9e0622ca574374e63f0f54bc SHA1 0b9aae054070ae3e941b2ddbae5af137de16fdfa SHA256 5dfbf5b22fd3e3fd53714334381588f02e5776b98e07abc1fdbd7ad14fc07486
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkEWFwACgkQvFcC4BYPU0q57QCffRPV+emEosqylrye7VPCpV5x
+zFQAnicElISwl0o7tGMvXVEY0lXqzP1d
+=hTMc
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.6.ebuild b/media-sound/audacity/audacity-1.3.6.ebuild
new file mode 100644
index 000000000000..e71675e9b534
--- /dev/null
+++ b/media-sound/audacity/audacity-1.3.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.6.ebuild,v 1.1 2008/10/26 11:45:26 aballier Exp $
+
+EAPI=2
+
+inherit eutils wxwidgets autotools
+
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://audacity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+RESTRICT="test"
+
+COMMON_DEPEND="=x11-libs/wxGTK-2.8*
+	>=app-arch/zip-2.3
+	>=media-libs/libsndfile-1.0.0
+	dev-libs/expat
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	mp3? ( >=media-libs/libmad-0.14.2b )
+	flac? ( >=media-libs/flac-1.2.0[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	twolame? ( media-sound/twolame )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080617 )
+	ladpsa? ( >=media-libs/liblrdf-0.4.0 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#	lv2? ( >=media-libs/slv2-0.6.0 )
+
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.3.4-automagic.patch"
+	epatch "${FILESDIR}/${PN}-1.3.5-libtool22.patch"
+	epatch "${FILESDIR}/${P}-novorbis.patch"
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	# * if libsamplerate not requested, use libresample instead.
+	# * if ladspa plug-ins are enabled, also enable sorting them into categories
+	# with liblrdf.
+	econf \
+		--enable-unicode \
+		--enable-nyquist \
+		$(use_enable ladspa) \
+		--with-libsndfile=system \
+		--with-libexpat=system \
+		$(use_with libsamplerate) \
+		$(use_with !libsamplerate libresample) \
+		$(use_with vorbis libvorbis) \
+		$(use_with mp3 libmad) \
+		$(use_with flac libflac) \
+		$(use_with id3tag libid3tag) \
+		$(use_with soundtouch) \
+		$(use_with vamp libvamp) \
+		$(use_with twolame libtwolame) \
+		$(use_with ffmpeg) \
+		--without-slv2 \
+		$(use_with ladspa liblrdf) \
+		$(use_with midi) \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+}
diff --git a/media-sound/audacity/files/audacity-1.3.6-novorbis.patch b/media-sound/audacity/files/audacity-1.3.6-novorbis.patch
new file mode 100644
index 000000000000..07543e129cff
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.6-novorbis.patch
@@ -0,0 +1,15 @@
+Index: audacity-src-1.3.6/src/export/ExportFLAC.cpp
+===================================================================
+--- audacity-src-1.3.6.orig/src/export/ExportFLAC.cpp
++++ audacity-src-1.3.6/src/export/ExportFLAC.cpp
+@@ -29,7 +29,10 @@ and libvorbis examples, Monty <monty@xip
+ #include <wx/log.h>
+ #include <wx/msgdlg.h>
+ 
++#ifdef USE_LIBVORBIS
+ #include <vorbis/vorbisenc.h>
++#endif // USE_LIBVORBIS
++
+ #include "FLAC++/encoder.h"
+ 
+ #include "../float_cast.h"
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index 2d6863184728..fde114d50a4d 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -4,6 +4,7 @@
   <herd>proaudio</herd>
   <use>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
+    <flag name="midi">Enables MIDI support</flag>
     <flag name="soundtouch">Enables soundtouch library support</flag>
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
     <flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag>