version bump, by Richard Ash <richard@audacityteam.org>, bug #312837

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 171 insertions, 5 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 0a6dd38f45e3..b395c85c83cd 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.138 2010/01/20 19:06:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.139 2010/04/12 08:38:53 aballier Exp $
+
+*audacity-1.3.12 (12 Apr 2010)
+
+  12 Apr 2010; Alexis Ballier <aballier@gentoo.org> +audacity-1.3.12.ebuild,
+  +files/audacity-1.3.12-automagic.patch:
+  version bump, by Richard Ash <richard@audacityteam.org>, bug #312837
 
 *audacity-1.3.11 (20 Jan 2010)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index bba86f7abf20..6defb70c0f9c 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX audacity-1.3.12-automagic.patch 2616 RMD160 46df352f4bf38276764361a13788547f9aa96d9e SHA1 f0f36031d277e1fd32681144ae1eb3669a54fc0e SHA256 655dbfc792c0c3373cf7062db0c478a1bd632aa1e7209f19f057a7d983d20960
 AUX audacity-1.3.4-automagic.patch 2625 RMD160 63f28b895aa94c2458cc3f16ed52f3a44f95c08b SHA1 908aba3830560e16678a35d9350e2f681c452bf9 SHA256 a992234a9219c266a4318ba0cfd23404d11dd0b1ebce587512996cdbc8fd4946
 AUX audacity-1.3.5-libtool22.patch 621 RMD160 9c8b46928a8dd2d1750163570fa9a36abb44212a SHA1 c1fb708d251331670a881bb3196baf21bfc5bee7 SHA256 c8f25696de80da8f41224be44c630c288e7a94290bb0d86fef6709e0d1923f67
 AUX audacity-1.3.7-cflags.patch 1099 RMD160 db05c38ce8ae3d91f7ec928f8096a089368d7414 SHA1 d6b5a69c28eb16fb9dcacebc2e461d53f7951106 SHA256 eab7268b3b7b3c2ac2eb07ede639c16f3babccc528f018af17a532082b478ca9
@@ -9,20 +10,22 @@ AUX audacity-1.3.8-gsocket-conflict.patch 410 RMD160 c5e2716c4a7e9df8d4ebf05a3f2
 AUX audacity-1.3.9-noflac.patch 1990 RMD160 7f16abef5e98773f853e45a4c2a4c15995ac7239 SHA1 2a76dcd0fd16b338b4c2cd1a78ab8966c351223a SHA256 6d1c90629ee0c7d38180012bdc29f28ae6074d2fd2a37570d0500edb86743724
 DIST audacity-minsrc-1.3.10.tar.bz2 6953513 RMD160 335564980b5692eff6338723bcbe60b4590dcce9 SHA1 f321f4abec9c282a213685e0189de2d5740a795c SHA256 7df8a12064cbd85b85a38ad56942dbbf46eace7ea685ec64daca9ad064e2ba09
 DIST audacity-minsrc-1.3.11.tar.bz2 7142931 RMD160 4ce073a5998c80eb31f5f40dcd198906bd5faf01 SHA1 7e08f82c36d118758c12b056cbe70f6490681d4f SHA256 2d59d5eeb2acf451142263876a7bebcab91bbff137c867effaf77d52c963e271
+DIST audacity-minsrc-1.3.12-beta.tar.bz2 6087920 RMD160 47dd021c24fb6ed05a845604db28056d981c28d3 SHA1 3df2187c9e869be6745fb1e1396586b9b0486485 SHA256 f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768
 DIST audacity-minsrc-1.3.7.tar.bz2 5386329 RMD160 b160789b97109e306e6fde19f3cf97453a747925 SHA1 ba4a696bb950800c690ec80138aa84801e04f35a SHA256 e0044916ffe0d6d8f9227fc1e3d973e11b37edd89005a110ebff482ef301d4d5
 DIST audacity-minsrc-1.3.8.tar.bz2 6734200 RMD160 3ae7ed409520b62f40e4c9fcd49ea5a25827b8a3 SHA1 8b8e5dbbf38546c08eb77005f77648d28836dfd4 SHA256 50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf
 DIST audacity-minsrc-1.3.9.tar.bz2 6719955 RMD160 eb7bcf3716498705fbcb318b9d8d5183c28678f6 SHA1 77330b3bb70070001262f6e3c7d74a1d94c93c5e SHA256 f47afe8dcf38165d3550160eb7e94694119f5da563674060a93c5bc66e2fa012
 EBUILD audacity-1.3.10.ebuild 2600 RMD160 3749b98542545bf78fb360179d5014925a054824 SHA1 f081542a6c574fef63e1de7308339ac045e70605 SHA256 7e6941793c28332230b080c295ed8e842c02f2dfa4f1702366b9f8d41aa6a617
 EBUILD audacity-1.3.11.ebuild 2605 RMD160 c7b1127013e426bfd772bfb2879c87eadbb1439e SHA1 a394798ac7b0c3951d31f3df80281b66ac23dabd SHA256 8a9de21289d8546aaa4ed3281daf21673a897938e49194a801cc749e46003864
+EBUILD audacity-1.3.12.ebuild 2611 RMD160 33e02639afd57b46aa41e2777fc0640952c423ab SHA1 84a20ef7cf1f20e0c31120fd3be16bfec9f56d1a SHA256 8c40dbb66f36465f9f92fc3681c9a5040c693b1cf4010d1b707286df572af496
 EBUILD audacity-1.3.7.ebuild 2674 RMD160 9d91ea24417c4a99923d799b723a1f996b66fa37 SHA1 5bf38720a92536a033be30885ffb83b9a7c6fb39 SHA256 231a444980ab817bc4cd87ae39f3c30e609f2b5be2b5966a7600022b2e6dd0af
 EBUILD audacity-1.3.8.ebuild 2645 RMD160 57193ede7b6070a39e273956454b3d1745400eff SHA1 4416347b21cfe056a3be4d5b8db69d5d1ebbf378 SHA256 f1be23f771d0ca552a85af52783a5ec14a9ec3818a624b7856273f98ab2c7cfb
 EBUILD audacity-1.3.9.ebuild 2696 RMD160 5a240e5400d6271d60acb7994188572076e5eacc SHA1 d2f62145c3200f21ae5384b12ab5d995212c0a54 SHA256 770e57d03b1b82f6256026129a7033fb111582c01336df39c076ea0ac6cb30b0
-MISC ChangeLog 22771 RMD160 e39b51490a905a2b439baccdf5b486fa4c99bfd6 SHA1 9a67297e457d7ac628119e5683995906d8b7224f SHA256 2a209c647872929766575ec8a1282941cd8762ae7274efe32943cb94e19fd2a5
+MISC ChangeLog 22994 RMD160 21e7f8380fb99a7faf5efbdc66d4ee64a2b0059d SHA1 e1e52839ea4e2a03abf6a6a50800cfdccac4949d SHA256 49f2fd9d1c2406a6c531d8502eab5162f2330aba4547a958178a81d454d97d51
 MISC metadata.xml 727 RMD160 3306c64d261828fe7ef77a6b10b86bdef95a7e90 SHA1 037f78e7a8bcd2a9691ea7a09078941b385b6737 SHA256 43d8778afc3c468b262cddd50200c8b0c54674fda12b8d8e55b0ce0f8f1a6e85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktXVCgACgkQvFcC4BYPU0r8qgCeLvhAuuJBmzWn0QJJXIFOgMZs
-0p4AnRH2wCnKuoG96WTSoKYXeF2Br/+3
-=ZeDZ
+iEYEARECAAYFAkvC3CIACgkQvFcC4BYPU0oMVQCgw9FeD5NkOcYRt+24KGAJ+PLL
+UYoAni+I5KSdDJ6QRz97+Iv7yI9WoGUd
+=9lZB
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.12.ebuild b/media-sound/audacity/audacity-1.3.12.ebuild
new file mode 100644
index 000000000000..9f0c7e2f0bda
--- /dev/null
+++ b/media-sound/audacity/audacity-1.3.12.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.1 2010/04/12 08:38:53 aballier Exp $
+
+EAPI=2
+
+inherit eutils wxwidgets autotools versionator
+
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}-beta"
+MY_T="${PN}-minsrc-${MY_PV}-beta"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://audacity.sourceforge.net/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_T}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~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-2.0 )
+	twolame? ( media-sound/twolame )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080617 )
+	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 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.12-automagic.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.
+	econf \
+		--enable-unicode \
+		--enable-nyquist \
+		$(use_enable ladspa) \
+		--with-libsndfile=system \
+		--with-expat=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) \
+		$(use_with midi) \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+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.12-automagic.patch b/media-sound/audacity/files/audacity-1.3.12-automagic.patch
new file mode 100644
index 000000000000..a7aa66d83d46
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.12-automagic.patch
@@ -0,0 +1,63 @@
+diff -ur ../audacity-src-1.3.12-beta.orig/configure.in ./configure.in
+--- ../audacity-src-1.3.12-beta.orig/configure.in	2010-03-30 12:32:42.000000000 +0100
++++ ./configure.in	2010-04-02 17:03:07.154028262 +0100
+@@ -559,6 +559,8 @@
+ esac
+ 
+ dnl PortAudio configuration
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
+ 
+ LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
+@@ -575,13 +577,21 @@
+       ;;
+    *)
+       dnl Unix
+-      AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+-      if [[ $have_alsa = "yes" ]] ; then
+-         LIBS="$LIBS -lasound"
+-      fi
+-      PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
+-      if [[ $have_jack = "yes" ]] ; then
+-         LIBS="$LIBS $JACK_LIBS"
++      if test "x$with_alsa" != "xno"; then
++         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
++         if [[ $have_alsa = "yes" ]] ; then
++            LIBS="$LIBS -lasound"
++        else
++            AC_MSG_WARN([Support for alsa not available])
++         fi
++      fi        
++      if test "x$with_jack" != "xno"; then
++         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
++         if [[ $have_jack = "yes" ]] ; then
++            LIBS="$LIBS $JACK_LIBS"
++        else
++            AC_MSG_WARN([Support for jack not available])
++         fi
+       fi
+       AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
+       if [[ $have_asihpi = "yes" ]] ; then
+Only in .: configure.in.orig
+diff -ur ../audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac ./lib-src/portmixer/configure.ac
+--- ../audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac	2010-03-30 12:29:47.000000000 +0100
++++ ./lib-src/portmixer/configure.ac	2010-04-02 17:03:07.154028262 +0100
+@@ -97,6 +97,7 @@
+ AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
+ AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
+ 
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
+ #
+ # Set up to use the identified ones
+ #
+@@ -107,7 +108,7 @@
+    objects="$objects px_unix_oss.o"
+ fi
+ 
+-if [[ $have_alsa = "yes" ]] ; then
++if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
+    AC_MSG_NOTICE(Including support for ALSA);
+    AC_DEFINE(PX_USE_LINUX_ALSA)
+    objects="$objects px_linux_alsa.o"
+Only in ./lib-src/portmixer: configure.ac.orig