Version bumped. Removed ~ppc and ~sparc for dependency.

Package-Manager: portage-2.1.2.2

6 files changed, 243 insertions, 15 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 186039cbda91..b848fa434fbd 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.63 2007/05/17 04:32:08 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.64 2007/05/19 07:09:32 matsuu Exp $
+
+*audacity-1.3.3 (19 May 2007)
+
+  19 May 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/audacity-1.3.3+flac-1.1.3.patch,
+  +files/audacity-1.3.3-gentoo.patch, +audacity-1.3.3.ebuild:
+  Version bumped.
+  Removed ~ppc64 and ~sparc for dependency(media-libs/libsoundtouch).
 
   17 May 2007; Joseph Jezak <josejx@gentoo.org> audacity-1.3.2-r1.ebuild:
   Marked ppc stable for bug #167126.
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index f1c580308561..a7efe87be71b 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX audacity-1.2.3-gcc41.patch 650 RMD160 4fabdb072b9e4a6c9d908694cc2e7cea8e1ce16e SHA1 dd9f41c9f011a244062ea0c0c28188716f7165ca SHA256 c8acd7c59f69d6bf8fba8773e47cd6b3b4a4cbfbc510b0ac7aa2f3b88ea344fb
 MD5 8d8b48aa5931322a0a0a8ad826335c38 files/audacity-1.2.3-gcc41.patch 650
 RMD160 4fabdb072b9e4a6c9d908694cc2e7cea8e1ce16e files/audacity-1.2.3-gcc41.patch 650
@@ -33,8 +30,17 @@ AUX audacity-1.3.2-no-msse.patch 436 RMD160 1115be038ed96c9cbac0f33d248c6794dd98
 MD5 02554130e92dcceb574954c71fcc7be9 files/audacity-1.3.2-no-msse.patch 436
 RMD160 1115be038ed96c9cbac0f33d248c6794dd982268 files/audacity-1.3.2-no-msse.patch 436
 SHA256 ffa5c3d0514d933f613804dcc0e8eb6d3510d1f3ed7cf450306327fedcd4e561 files/audacity-1.3.2-no-msse.patch 436
+AUX audacity-1.3.3+flac-1.1.3.patch 3880 RMD160 36b3a663f6176f3453f078dde4756f26979f9e3b SHA1 f845c8337e8287da8df608df42cdbfaf4862980c SHA256 011535131d13dc212dc3876b37fd1c3f2bd844a4c7a00ccd826f4f471319305c
+MD5 a0f597abfd605b0e8c2d0e683c93cd66 files/audacity-1.3.3+flac-1.1.3.patch 3880
+RMD160 36b3a663f6176f3453f078dde4756f26979f9e3b files/audacity-1.3.3+flac-1.1.3.patch 3880
+SHA256 011535131d13dc212dc3876b37fd1c3f2bd844a4c7a00ccd826f4f471319305c files/audacity-1.3.3+flac-1.1.3.patch 3880
+AUX audacity-1.3.3-gentoo.patch 18178 RMD160 7f1d68a4222fd55bf8e0f52025725e6d5bbb3213 SHA1 872a8d48bbd68ab64d09c064763340aa8a44db1e SHA256 2f54013d5b72acf66da55300c91a458237b2a58befde0ee65624552f84d69655
+MD5 94694bfad9670ec1d71672b5e7bbbf2b files/audacity-1.3.3-gentoo.patch 18178
+RMD160 7f1d68a4222fd55bf8e0f52025725e6d5bbb3213 files/audacity-1.3.3-gentoo.patch 18178
+SHA256 2f54013d5b72acf66da55300c91a458237b2a58befde0ee65624552f84d69655 files/audacity-1.3.3-gentoo.patch 18178
 DIST audacity-src-1.3.0b.tar.gz 4938302 RMD160 4ada2e40799f60477d6c2aabb0b91bb03c8882f9 SHA1 6ba57ee1a3a9b6c57bf98142fbe4561b7cadf5db SHA256 cff02da856622acbca7b6ce9e0c05ad0cabc0c10fc5f79e349d2e586176e49f9
 DIST audacity-src-1.3.2.tar.gz 6683449 RMD160 b61747103675881bdf32762deea7635a2827b0de SHA1 87690806763b7de26a8e2df1f0d4c3a7e6d1a404 SHA256 aa37c00014ee79516fb5dce4c56e1038a7eaf5ad22a10743f0609ed186baf621
+DIST audacity-src-1.3.3.tar.gz 6649291 RMD160 ca0099bd00af8c863834b56b64c26b6a54a9e8b0 SHA1 1b52f0de736cb5903df3e4776530839bee26f567 SHA256 9a3e58c3ce04e5b1d743891bc7af6a2a22f01e846111af560def6a6cb360729d
 EBUILD audacity-1.3.0b.ebuild 1592 RMD160 0804ceb675363ce9f88759c5af02b39d5d95d869 SHA1 b448d58248d0359a8680ff084ad6489ee0720753 SHA256 f77d0ef4a82c2ec9f63252b689dc223370768aa2d0941479b8edd330814c8674
 MD5 0f3b8f57120fda877141d65bc0c83675 audacity-1.3.0b.ebuild 1592
 RMD160 0804ceb675363ce9f88759c5af02b39d5d95d869 audacity-1.3.0b.ebuild 1592
@@ -43,10 +49,14 @@ EBUILD audacity-1.3.2-r1.ebuild 2207 RMD160 3a128dd20035c1a139f0b600be0e9f023714
 MD5 eddef5b53c0fcd28f241151f8112e0a3 audacity-1.3.2-r1.ebuild 2207
 RMD160 3a128dd20035c1a139f0b600be0e9f0237141020 audacity-1.3.2-r1.ebuild 2207
 SHA256 228f081972e998ae818c51deb0c78886675400fc7953c6316e1181d5506d428c audacity-1.3.2-r1.ebuild 2207
-MISC ChangeLog 11635 RMD160 899eaa29e203f7fac405f33ea4db86ffaed57fe6 SHA1 d08863080ecf6bacc1e2e035dc8368cc3adefddf SHA256 641162c75452434c4615b8b942872426b5edb4ae80aa02ee970f7cecdff75ee7
-MD5 f53a219e22d467773675b3e1529a7366 ChangeLog 11635
-RMD160 899eaa29e203f7fac405f33ea4db86ffaed57fe6 ChangeLog 11635
-SHA256 641162c75452434c4615b8b942872426b5edb4ae80aa02ee970f7cecdff75ee7 ChangeLog 11635
+EBUILD audacity-1.3.3.ebuild 2050 RMD160 3a906c62ebee291af441b7f021ebb1dc6b1c2786 SHA1 b70841f800d36f4f97aeeb460c9acbbd0e3717b4 SHA256 93e0ffd8010606da52a863e35bd84cac6b14497b5b36e87c7f69c3270c07aca2
+MD5 2c79fd533ff6e01d4ec5c04566f6edff audacity-1.3.3.ebuild 2050
+RMD160 3a906c62ebee291af441b7f021ebb1dc6b1c2786 audacity-1.3.3.ebuild 2050
+SHA256 93e0ffd8010606da52a863e35bd84cac6b14497b5b36e87c7f69c3270c07aca2 audacity-1.3.3.ebuild 2050
+MISC ChangeLog 11908 RMD160 ae9af435dfe53b670b4c8a32bcf60e5c7536f8ea SHA1 da7ac790294f233f213cd993dc96bf77e45d6b57 SHA256 5183967faebf2e5be4ba9a067f07599bad4f4455afa52fc408013a57f3015490
+MD5 7dc52842ea95ef37c6b38fb9dc69a8a9 ChangeLog 11908
+RMD160 ae9af435dfe53b670b4c8a32bcf60e5c7536f8ea ChangeLog 11908
+SHA256 5183967faebf2e5be4ba9a067f07599bad4f4455afa52fc408013a57f3015490 ChangeLog 11908
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -57,10 +67,6 @@ SHA256 6b57e9e5b74084d73ba901bf32af44a0e9b4bf4eb1da81905f1f7ae523d91e27 files/di
 MD5 e4cb0c698f065ef88bab1eba174707aa files/digest-audacity-1.3.2-r1 259
 RMD160 8c96101c6f992bb514996875537ada9adde0edab files/digest-audacity-1.3.2-r1 259
 SHA256 707a1fdb467f1d843eb4978eac90c42d2a428918549578c186d6c568808aaaa5 files/digest-audacity-1.3.2-r1 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGS9rPcsIHjyDViGQRAvLjAJ4kFxMm8YFx+pZVylIxJgzJUdE0WgCfentX
-4ctHkAVeYC4kjyDWFykuIJU=
-=jii+
------END PGP SIGNATURE-----
+MD5 7a0750f94509a9ef07772543a2c71089 files/digest-audacity-1.3.3 259
+RMD160 a4f1cfe7be858792cd5246836b42ea01208b13d1 files/digest-audacity-1.3.3 259
+SHA256 b0009aac878b85fbc30afa099b93662d12c126e5a614114ae5de70d0717141fa files/digest-audacity-1.3.3 259
diff --git a/media-sound/audacity/audacity-1.3.3.ebuild b/media-sound/audacity/audacity-1.3.3.ebuild
new file mode 100644
index 000000000000..8b3fff95a792
--- /dev/null
+++ b/media-sound/audacity/audacity-1.3.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.3.ebuild,v 1.1 2007/05/19 07:09:32 matsuu Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit eutils autotools wxwidgets
+
+IUSE="flac ladspa libsamplerate mp3 unicode vorbis"
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://audacity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="test"
+
+DEPEND=">=x11-libs/wxGTK-2.6
+	>=app-arch/zip-2.3
+	dev-libs/expat
+	>=media-libs/libsndfile-1.0.0
+	>=media-libs/libsoundtouch-1.3.1
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	mp3? ( >=media-libs/libmad-0.14.2b
+		media-libs/libid3tag )
+	flac? ( media-libs/flac )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )"
+RDEPEND="${DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+
+S="${WORKDIR}/${MY_P}-beta"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
+
+	eautoreconf || die
+}
+
+src_compile() {
+	local myconf
+	WX_GTK_VER="2.6"
+
+	if use unicode; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
+	fi
+
+	myconf="${myconf} --with-libsndfile=system"
+	myconf="${myconf} --with-libexpat=system"
+	myconf="${myconf} --with-libsoundtouch=system"
+
+	if use libsamplerate ; then
+		myconf="${myconf} --with-libsamplerate=system --without-libresample"
+	else
+		myconf="${myconf} --without-libsamplerate" # --with-libresample=local
+	fi
+
+	econf \
+		$(use_enable unicode) \
+		$(use_with ladspa) \
+		$(use_with vorbis vorbis system) \
+		$(use_with mp3 libmad system) \
+		$(use_with mp3 id3tag system) \
+		$(use_with flac flac system) \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+
+	insinto /usr/share/audacity/
+	newins images/AudacityLogo48x48.xpm audacity.xpm
+}
diff --git a/media-sound/audacity/files/audacity-1.3.3+flac-1.1.3.patch b/media-sound/audacity/files/audacity-1.3.3+flac-1.1.3.patch
new file mode 100644
index 000000000000..11b1128c6cc8
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.3+flac-1.1.3.patch
@@ -0,0 +1,121 @@
+diff -Naur audacity-src-1.3.3-beta.orig/acinclude.m4 audacity-src-1.3.3-beta/acinclude.m4
+--- audacity-src-1.3.3-beta.orig/acinclude.m4	2007-05-18 13:56:02.000000000 +0900
++++ audacity-src-1.3.3-beta/acinclude.m4	2007-05-19 13:37:01.000000000 +0900
+@@ -479,7 +479,7 @@
+    dnl See if FLAC is installed in the system
+ 
+    AC_CHECK_LIB(FLAC,
+-                FLAC__file_decoder_new,
++                FLAC__stream_decoder_new,
+                 lib_found="yes",
+                 lib_found="no",
+                 -lFLAC++ -lFLAC)
+diff -Naur audacity-src-1.3.3-beta.orig/src/export/ExportFLAC.cpp audacity-src-1.3.3-beta/src/export/ExportFLAC.cpp
+--- audacity-src-1.3.3-beta.orig/src/export/ExportFLAC.cpp	2007-05-18 13:55:50.000000000 +0900
++++ audacity-src-1.3.3-beta/src/export/ExportFLAC.cpp	2007-05-19 13:41:16.000000000 +0900
+@@ -145,6 +145,13 @@
+ 
+ #define SAMPLES_PER_RUN 8192
+ 
++/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ static struct
+ {
+    bool        do_exhaustive_model_search;
+@@ -229,7 +236,9 @@
+       gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
+ 
+    FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
++#ifdef LEGACY_FLAC
+    encoder->set_filename(OSFILENAME(fName));
++#endif
+    encoder->set_channels(numChannels);
+    encoder->set_sample_rate(int(rate + 0.5));
+ 
+@@ -264,7 +273,11 @@
+    encoder->set_rice_parameter_search_dist(flacLevels[levelPref].rice_parameter_search_dist);
+    encoder->set_max_lpc_order(flacLevels[levelPref].max_lpc_order);
+ 
++#ifdef LEGACY_FLAC
+    encoder->init();
++#else
++   encoder->init(OSFILENAME(fName));
++#endif
+ 
+    int numWaveTracks;
+    WaveTrack **waveTracks;
+@@ -343,7 +356,7 @@
+    return new ExportFLAC();
+ }
+ 
+-#endif // USE_LIBVORBIS
++#endif // USE_LIBFLAC
+ 
+ // Indentation settings for Vim and Emacs and unique identifier for Arch, a
+ // version control system. Please do not modify past this point.
+diff -Naur audacity-src-1.3.3-beta.orig/src/import/ImportFLAC.cpp audacity-src-1.3.3-beta/src/import/ImportFLAC.cpp
+--- audacity-src-1.3.3-beta.orig/src/import/ImportFLAC.cpp	2007-05-18 13:55:53.000000000 +0900
++++ audacity-src-1.3.3-beta/src/import/ImportFLAC.cpp	2007-05-19 13:37:01.000000000 +0900
+@@ -63,6 +63,13 @@
+ #include "../WaveTrack.h"
+ #include "ImportPlugin.h"
+ 
++/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ class FLACImportFileHandle;
+ 
+ class MyFLACFile : public FLAC::Decoder::File
+@@ -273,6 +280,7 @@
+ 
+ bool FLACImportFileHandle::Init()
+ {
++#ifdef LEGACY_FLAC
+    bool success = mFile->set_filename(OSFILENAME(mName));
+    if (!success) {
+       return false;
+@@ -281,11 +289,23 @@
+    if (state != FLAC__FILE_DECODER_OK) {
+       return false;
+    }
++#else
++   if (mFile->init(OSFILENAME(mName)) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++      return false;
++   }
++#endif
+    mFile->process_until_end_of_metadata();
++#ifdef LEGACY_FLAC
+    state = mFile->get_state();
+    if (state != FLAC__FILE_DECODER_OK) {
+       return false;
+    }
++#else
++   // not necessary to check state, error callback will catch errors, but here's how:
++   if (mFile->get_state() > FLAC__STREAM_DECODER_READ_FRAME) {
++      return false;
++   }
++#endif
+    if (!mFile->is_valid() || mFile->get_was_error())
+    {
+       // This probably is not a FLAC file at all
+@@ -349,7 +369,11 @@
+       mChannels[1]->SetTeamed(true);
+    }
+ 
++#ifdef LEGACY_FLAC
+    mFile->process_until_end_of_file();
++#else
++   mFile->process_until_end_of_stream();
++#endif
+    
+    *outTracks = new Track *[*outNumTracks];
+    for(c = 0; c < *outNumTracks; c++) {
diff --git a/media-sound/audacity/files/audacity-1.3.3-gentoo.patch b/media-sound/audacity/files/audacity-1.3.3-gentoo.patch
new file mode 100644
index 000000000000..76aa5684be9b
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.3-gentoo.patch
diff --git a/media-sound/audacity/files/digest-audacity-1.3.3 b/media-sound/audacity/files/digest-audacity-1.3.3
new file mode 100644
index 000000000000..061f5cb2cc0e
--- /dev/null
+++ b/media-sound/audacity/files/digest-audacity-1.3.3
@@ -0,0 +1,3 @@
+MD5 72a9e3239f3b5af63030a1e1b07e40e7 audacity-src-1.3.3.tar.gz 6649291
+RMD160 ca0099bd00af8c863834b56b64c26b6a54a9e8b0 audacity-src-1.3.3.tar.gz 6649291
+SHA256 9a3e58c3ce04e5b1d743891bc7af6a2a22f01e846111af560def6a6cb360729d audacity-src-1.3.3.tar.gz 6649291