Version bump.

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

5 files changed, 133 insertions, 22 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 1d30977fc914..7bfba3ae05c8 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.161 2011/08/07 17:08:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.162 2011/12/13 23:00:48 radhermit Exp $
+
+*audacity-1.3.14 (13 Dec 2011)
+
+  13 Dec 2011; Tim Harder <radhermit@gentoo.org> +audacity-1.3.14.ebuild,
+  +files/audacity-1.3.14-typecast.patch:
+  Version bump.
 
   07 Aug 2011; Tim Harder <radhermit@gentoo.org> -audacity-1.3.8.ebuild,
   -files/audacity-1.3.8-automagic.patch,
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index e53b16c7166a..df3cc8cfd387 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -3,18 +3,21 @@ Hash: SHA512
 
 AUX audacity-1.3.13-automagic.patch 2306 RMD160 1b5177bdeee1acd55f09b8c428114d0a7e8fc719 SHA1 7ea05df2066602d080308f33813518cde5878bf6 SHA256 5ed3dddb9e095b7f17437ea0d62f357e14cef7e64987b393aa47589541cccbb2
 AUX audacity-1.3.13-ffmpeg.patch 7127 RMD160 6704ed714e88776a3a1ab9d5916619eedf31681c SHA1 26c2ad8e611705b2762a318e66312169f59cc218 SHA256 004c0b8ad34ab5dc0c3da4c07d8b61a3f6c8249a5b4325a6994b91f978661a00
+AUX audacity-1.3.14-typecast.patch 594 RMD160 f5b65972a389fb43012c7cd5d7e9b10f89897315 SHA1 6876ba2b8727cfc7c7ea981f03ecfc4697ae7fa6 SHA256 2b524ae2e1a9dc4b7ba17de1398aa81cb91d363f5b37ffed856043734e353f79
 DIST audacity-minsrc-1.3.13-beta.tar.bz2 6450901 RMD160 36c7e8b6dbd5dbfd265afe00fd7ea6e34894a29e SHA1 47a1340699958c8e1804f374209835be865d7027 SHA256 4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83
+DIST audacity-minsrc-1.3.14-beta.tar.bz2 6595572 RMD160 bde12b39ebd37ee35f943407b1353843fa08e7df SHA1 a0fb22a0cfbb8a72abac8bbc01b3ad8b0bb7e11e SHA256 35990403cf078b862e7c839c73e5ef5f6b5160de1e3ccbd846e6153883194ab2
 EBUILD audacity-1.3.13.ebuild 2629 RMD160 832b0904089708f09639d936a634f593e20ccf20 SHA1 a91d7fe8a9aa5d5d427f788f96fac372a0265c99 SHA256 dc6632e356fd109475b521273a30bd8552d21580867c681b64837cc3ce00d65e
-MISC ChangeLog 26975 RMD160 5b48fb5a2b83d0f50a34dbc09d8543ce8ca20364 SHA1 e7004c73cf95ca6cb9be6b4f4668b3efebe84aa0 SHA256 c0b7bafa1d649e8a28b857bf0bc5a8db7ef40bacf7f5c9138e9d5c2acfac7ae6
+EBUILD audacity-1.3.14.ebuild 2697 RMD160 dbd6576468ef47c84d12411e286c02bcffedeade SHA1 92c85011497b8dbcc049e9a6199a954b6b4b3ac6 SHA256 0fc72adb1b638631e39c663f89274fdf5de364c5bad8b959f6ca3d95d84583d9
+MISC ChangeLog 27139 RMD160 6240e032ec43180fef1e07114539095b29015342 SHA1 6301f6b6d473b79287ee71aa2884201142951004 SHA256 deffb38fe8ddd9bc1ff56fb8b02549113f025a0312b75fd870c2c4d9256a1c1e
 MISC metadata.xml 727 RMD160 3306c64d261828fe7ef77a6b10b86bdef95a7e90 SHA1 037f78e7a8bcd2a9691ea7a09078941b385b6737 SHA256 43d8778afc3c468b262cddd50200c8b0c54674fda12b8d8e55b0ce0f8f1a6e85
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOPsaJAAoJEEqz6FtPBkyjEHQH/2vCrtVILfj2ZWWOKopcBmMt
-/OZKrJ7gnMfQZgE7S4on7+fzI7DmFFzHSifL32REknZqZGsIFeTLSs56fgMjGPy5
-tjGr1g2ncXDHOkR3enJ4Sp1TWpz2qDLWZFL2uKYVVpjxomD34WH5HHzMTEJxzlF0
-CFFFwoMxkP7HwpIfFtXZIJLun7+y5YWrXQuK/ziVi8620Qd/OG36RX8/KkppUhb/
-lFT7RSycpBC/cFnN1jscaRtc5okqmQUSYX+yd7M/Mtue+yEhKn9nItm9ahMM9LUi
-KqtACM+WVdyugbAkgQPleZlG0278SN3D8ANww/GTCxG7y7jpLA6XwXgkEy/aeDc=
-=txGM
+iQEcBAEBCgAGBQJO59kmAAoJEEqz6FtPBkyjSLkIAKwpik6MBFVZiVhMTQeJ9GCO
+0sd5BtGLfrjgDiHgpA/U69e0tCvgneARA2SDYDir/XOoMCfjEhQYgzgrbkuPwU7I
++JUs4MlkQgwHVqJ19koF8PD66WeTVYML7jh86cpee381HUfFuOQok8sXN8brkq8p
+X4RMoo7ym9NOQhfcbSdEr8WaG6oLEVs5Jcmw9YNxMqKPtUvcrBV89gcV094rVf9I
+cSrAJe3pcUtQUhvuJBINV0dEtvJxMXekLch+cm8TR36p4comAcG6F7s3rwdVJBx8
+qZOKXl9Ile2RC/ljE93MiGp2aM7OXPJRGJ/YU1IbasFZ0zbbOM5WzcP/jNB0hoU=
+=iQKv
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.14.ebuild b/media-sound/audacity/audacity-1.3.14.ebuild
new file mode 100644
index 000000000000..e6b3d77222b0
--- /dev/null
+++ b/media-sound/audacity/audacity-1.3.14.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.14.ebuild,v 1.1 2011/12/13 23:00:48 radhermit Exp $
+
+EAPI=4
+
+inherit eutils wxwidgets autotools versionator
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+	>=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? ( virtual/ffmpeg )
+	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"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
+	epatch "${FILESDIR}"/${PN}-1.3.13-ffmpeg.patch
+	epatch "${FILESDIR}"/${P}-typecast.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
+
+	# 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.14-typecast.patch b/media-sound/audacity/files/audacity-1.3.14-typecast.patch
new file mode 100644
index 000000000000..c01046143b21
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.14-typecast.patch
@@ -0,0 +1,15 @@
+--- audacity-src-1.3.14-beta/src/TrackPanel.cpp.orig
++++ audacity-src-1.3.14-beta/src/TrackPanel.cpp
+@@ -2915,7 +2915,11 @@
+    {
+       // Make sure we always have the first linked track of a stereo track
+       if (!mouseTrack->GetLinked() && mTracks->GetLink(mouseTrack))
+-         mouseTrack = mTracks->GetLink(mouseTrack);
++         mouseTrack = 
++#ifndef USE_MIDI
++                      (WaveTrack*)
++#endif
++                                   mTracks->GetLink(mouseTrack);
+ 
+       // Temporary apply the offset because we want to see if the
+       // track fits with the desired offset
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 811d1479f5b3..cfa4f3f9b49e 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX gnump3d.conf.d 159 RMD160 8578277660b38c694741242c0976dcbec025c79e SHA1 46f252357dfc09a41040f03e2cfac6e5d3ba1078 SHA256 f78bbe10fd4b7e1fdb860a3fa99490cdb98e827ff35c1e8077da77f5bf0340f2
 AUX gnump3d.init.d 840 RMD160 0702b419c3d1532d8d78fba41ced340f3f811a45 SHA1 651a82db74aa9d4de2c40070722bfea2e424e776 SHA256 08e2f0d2dd97be4d6c52cf229e519d7b96fe3a8e3b582240d2e639875cfd2e7f
 DIST gnump3d-3.0.tar.bz2 633215 RMD160 c0c3cbe31a6961675636309e82f4ff116db323f1 SHA1 3ba3ec3001084ec59f3b75769ae84cef467654d7 SHA256 1ac5bd0e850b0e18ccd9d19219f5108fa84b50d8ae3825a361e8b907eab7f19c
-EBUILD gnump3d-3.0-r1.ebuild 2053 RMD160 11b6ebea456c8064e1eaac45e533d29b9faaa5ab SHA1 044219d0c6f9ef5e112986d5e07c6ee28cbce40c SHA256 74f2902fad6f1d76e91946383904c388144594a938bbb6b2d479393da01d2143
+EBUILD gnump3d-3.0-r1.ebuild 2045 RMD160 3480d9c9b2e708aa37c8cfbff51742c8700bb657 SHA1 6c07efcfecaf8efad68ea1bd476274ef33d7d242 SHA256 12df5e4c881bb1ab51ed279f44559cd8f2c7040003aa592393e15e6115d59021
 EBUILD gnump3d-3.0.ebuild 1701 RMD160 2a9f2a3a126865dce955370474a7595c5e86ba9d SHA1 10aaff2f0d11733ff4096bdb1abc98b8f49bb1f9 SHA256 a8c2e6cfc4217fc91da2cbc4069208c73552784a9c09a05f31385fd59c5b6046
-MISC ChangeLog 9272 RMD160 1f5315b82273f447235eb692c83d11e8aebc17e1 SHA1 b147f401426f387662c8ba0105479051d2ade069 SHA256 bd4ddf0cad1777c23554353e2ac888daeb62574dcc64038751fe3f8de7551ba7
+MISC ChangeLog 9374 RMD160 d8405307b3efed0db40c947e573f71b8e55260f2 SHA1 37217fb62b7fd61734878bcaff34982f60763cee SHA256 713d481237fd4e8af524138469c6bc617b8ae425bb07909ed3851b0ee65170c3
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk7kcuwACgkQuUQtlDBCeQLCQACeLCNkeSYVQWn8zAkmjs4BaEzZ
-UpMAn2/do3GHu9EY2h+n2Dcm5XFVrnFJ
-=uLu0
------END PGP SIGNATURE-----