Version bump WIP, see bug #524242

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 138 insertions, 14 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index ca445f28b957..222e6e91264d 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.191 2015/07/11 19:08:40 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.192 2015/07/20 15:21:39 yngwin Exp $
+
+*audacity-2.1.1 (20 Jul 2015)
+
+  20 Jul 2015; Ben de Groot <yngwin@gentoo.org> +audacity-2.1.1.ebuild,
+  metadata.xml:
+  Version bump WIP, see bug #524242
 
   11 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> audacity-2.0.5.ebuild:
   x86 stable wrt bug #522036
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 765f05008f7c..8988e2084602 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -4,18 +4,31 @@ Hash: SHA256
 AUX audacity-1.3.13-automagic.patch 2306 SHA256 5ed3dddb9e095b7f17437ea0d62f357e14cef7e64987b393aa47589541cccbb2 SHA512 528263e6fc909804edb1df8714de6d229c0917abeba13fec6013ae7312790fbe5548f29497753c65445dd7c2b51190f81f7cc918c1b3921e0ab0efbefcb8c257 WHIRLPOOL 4a0516702dc8ab759a02ee3921253fe6819ecb3fb298055d7c481c88a35aa18e5a7ebb2a807d08cdba04a44b75706c2b8d783d0a3ad0ff5e1357e05f96823d52
 AUX audacity-1.3.13-ffmpeg.patch 7127 SHA256 004c0b8ad34ab5dc0c3da4c07d8b61a3f6c8249a5b4325a6994b91f978661a00 SHA512 44ffd59ce04f1415ca19d27262c646dd9c2ab8cf1835166a5fb9627e99a8e635cd348a8f7809bd0f632c37fe1c1394c15bc72826b7ee4cec6c929ec017a34d19 WHIRLPOOL b358764cadc951bcdf2b2cbf2810e2d4b062cf6b2bc3b09376ba4645dabf654753f7a7f435304a3c0694491207a8746650105b1940f4492c9d986c571e1cfca9
 AUX audacity-1.3.14-typecast.patch 594 SHA256 2b524ae2e1a9dc4b7ba17de1398aa81cb91d363f5b37ffed856043734e353f79 SHA512 2f8e333365996d5be0f05cbcf463385b2ee460afcc8b15be6d3d56e24b20e90ae4e690417c3f0db104556a05a8bb02d8b90371777cfc6705ffd5f5298cb9ec95 WHIRLPOOL 995697329eaad25726d649063eadf3b03283c862c7c848c0f47aa830e3f9a3b571e557d345daef2322b39164d88d41d47b269de2c5958731708c6bab0c27ebf3
+DIST audacity-manual-2.1.1.zip 20224419 SHA256 fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84 WHIRLPOOL 4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b
 DIST audacity-minsrc-2.0.2.tar.bz2 6794285 SHA256 ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d SHA512 3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e WHIRLPOOL 3fe42264f20920d1cadd3386c4521ce557c5f10ee5168cb4222843a25894de6a0106f2ed4246a5ab827fd4765a30cca21d81945092f5fe21bd1009483e098868
 DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004 WHIRLPOOL 106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
+DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256 49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512 36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d WHIRLPOOL 240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762
 EBUILD audacity-2.0.2.ebuild 2633 SHA256 79e80f0e3c3d4e7a49a64518467aec70c10f47844dfe939cc8fbe118aa1eba6b SHA512 70661da37e99e129814cc227bb6f32a46311aca3344836fbdbe279e321fc5d7e0e0bd5ffceff822a35f31e92ef2def3e0c98e08c653d4b209bf00b2bf1f647b5 WHIRLPOOL 2b6d848be87ea07b12f8159f2ee697299d10022e3aca58b90d6e21b81d9aec939a4e1ddcf04b64782b5cd433c1be17bad224c4fdd08bdee3bc66a0e630649920
 EBUILD audacity-2.0.5.ebuild 2746 SHA256 30b54e46206bccd34f25e194a1fec0f91734cf37d44dbca23db58ce7ef373229 SHA512 5c884bbe0dff8e44063bae89af865d0ca55540b151378bfbd242b1efc46dbd26869671079900040ef098fe7902b9c51daf58fcdd2da1a5878ecf146f18636a68 WHIRLPOOL 66c286096d5dde9056420af79b225504f3c6473fe05cb1153a8957a883392fd2cffbec20aeb160454cbcb9d26cedaef018ccf616760b0e81d227252eaea893f0
-MISC ChangeLog 30660 SHA256 09ff9b78a839cfd7a472705c80bc874c7f30359a1d3c8a8e131e38639d828c8c SHA512 2a524a2c377a6c67c6a392cc6f5df64776d92125bf416c2d4b7907eee816ed9ed1da3576a252cff70e9d2dc752b281ce5b91c9abd51fb9512996296b34a6bf26 WHIRLPOOL bbbe94820b9768498a56dd44eeb67b6d3c9b2b3af675491d9329bde25e09d22d03ddb09b8ca45a72fd8049698bbea0f6578137f6636745d1d53afe874fadcb06
-MISC metadata.xml 1101 SHA256 95edb43969239f607dcafc0fac2053a6f7863eb05c4158724f1c82c4c95b8f90 SHA512 4283b9a843eac1de53d27802695d5643eb6497597232193a87e743393a615678e704acff3623a6464c44df1930af8e38fcc7ae7e7774d48daeb1bb6165da0645 WHIRLPOOL 419476939a22c2d2cae97848c164a7cfae2892e650a447e2edf37d3a898631fb771d818127c122cd592f8b1b013eb62e475784eb33186b53b02e4226c4ccc295
+EBUILD audacity-2.1.1.ebuild 2878 SHA256 aa32722ad0a68b9e35e2018ffd8042576425e92068da1c1f3ec6cc94334e9d37 SHA512 9a0167ff31ced3f9a03e1438bfce4ddf883dfe83ec16b545957c99a1e21240b8e5cf37e1d8931c4fc6390fb61117ed6c2401a5a1839b842ffcbe95bbd3befbd8 WHIRLPOOL c7e8583cb47c19e5a7f030bba0d477444d3196346c1e3b429de2bf3b222a880feb73eaea907f796c9999e4826ae73c9500048f754cf90098027ea61712574c27
+MISC ChangeLog 30815 SHA256 d74df9470d740b13934e19e6d7e6fad43c2742c26c5d911b6ff08b224bfaa121 SHA512 0d27c15db2348db0bbef65881a7a93695f9ddc579a1119e11b46128270102f641f34f4a2ddb865a5499789d629681dc83feb2e31bc1f9c8e88f7568a1df839f2 WHIRLPOOL 7f0a40b28dad7243c9031d94b1c1702631e59d9b37eaa4eb0f9fd3535f3e83bef7e2530dd2400aa71cdda926907c66ac129fb08f70ae1876399c17517781ad6c
+MISC metadata.xml 1293 SHA256 1bf5f63d88db513a96b4aa22e706be61203cd3292b4c7db35c9b2fe6dcedadac SHA512 0f1747ce356e674bf2848f1db35140e4b79abdd494ae6ae139a8d69cc48fd1bebf156638a6c1a26d725f4cdeea1c27ce10b495396fcd68bd85ab01b2d6ad62da WHIRLPOOL 199eb9de405a529a68dc0803e5abba3029eabb433abc4fd981d11655110e1cc0fa114430d3ede5d8a73d16052da2f36b8b3dde28e7bae67c375b553847eda2b7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iJwEAQEIAAYFAlWhaTEACgkQG9wOWsQutdZ+cgP/eJFZ+C78EG6QfiNIK/kGfXO4
-CV83SGVgJOzmgRD31HXVyi8tXZeO9CHbJjHTjlsF7qavazCtB2dwHGJpHGj7A+8x
-DggCAkUVEarDXuSVMIgrZHOZbttbJ9JTU8lUcSFrB43mgpzz9SPFSxRpu28lXex+
-8vHwfHEY5Ectcc6AN2Y=
-=GhKa
+iQJ8BAEBCABmBQJVrRIHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOjCcP+QGW9uSCeoBs2Wrc6126hq3O
+xNDQkGehOCyiuMh4tzjeVhjHjsqkqvhr/CyvyOEOv8WLFI0glGd20rqSC3YLxR1L
+dDK7kZ2S4kHxYUR6Or5P8PXsBISibErK2Z4tf3yVJkcighz+RlShr4RCLTXa3ten
+9qlsxEXZgy8K9aPhvXU/RSs470kLdAbFhfnh/QvXBFZsLLGXYurL7L3VqEfAyXN4
+qPxQqSIIbjbTUnMEwIvq7BpBCe03hgd58my5gZiPRuvPIikhoKZnmEYF85UiTv4a
+V3t02kxOtNAaax1nB6G1n+AQM/lIZ43Emfez4qr76GMjBW69rg+wBzqj+G1vpJsB
+zHP6Vl7JM2vbMdeX4gp+KQUJbnrtB8AvkMsoDIILiMMSAWUvCxWgRTd3RlILoDIv
+p/HHvVLURznxEOlKDmNPX2lKGZPIMFXsOxqoqH911XgRA8BO1IA+PoPrggHMgF+7
+8jq1VSCLKWuXti/+6AM3p0AKZukNQxDuhl8BL0VJoSXrwnWdaDL+SpUr4r1HCPzG
+yHyzU4DIVwFee5kfIpzFzNWLkvjCuhifweIX8eU8SA8BPLeDkolEdKjnsWG64crG
+KvaTPUlc5yeM25RDGMpZKknSt6lE+ejdFQiyFjUvEznv9KiXJyqD0S5TwlfI/1sR
+2MO1JCORskyTtYL1bMIJ
+=htj5
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-2.1.1.ebuild b/media-sound/audacity/audacity-2.1.1.ebuild
new file mode 100644
index 000000000000..29ed2c610fcf
--- /dev/null
+++ b/media-sound/audacity/audacity-2.1.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-2.1.1.ebuild,v 1.1 2015/07/20 15:21:39 yngwin Exp $
+
+EAPI=5
+inherit eutils wxwidgets
+
+MY_P="${PN}-minsrc-${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/"
+SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${MY_P}.tar.xz
+	doc? ( http://dev.gentoo.org/~yngwin/distfiles/${PN}-manual-${PV}.zip )"
+	# wget doesn't seem to work on FossHub links, so we mirror
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+	dev-libs/expat
+	>=media-libs/libsndfile-1.0.0
+	=media-libs/portaudio-19*
+	media-libs/soxr
+	x11-libs/wxGTK:2.8[X]
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( libav? ( media-video/libav:= )
+		!libav? ( >=media-video/ffmpeg-1.2:= ) )
+	flac? ( >=media-libs/flac-1.2.0[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+	lame? ( >=media-sound/lame-3.70 )
+	lv2? ( media-libs/lv2 )
+	mad? ( >=media-libs/libmad-0.14.2b )
+	midi? ( media-libs/portmidi )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	twolame? ( media-sound/twolame )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+#src_prepare() {
+#	epatch "${FILESDIR}"/${P}-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
+	econf \
+		$(use_enable nls) \
+		--enable-unicode \
+		$(use_enable cpu_flags_x86_sse sse) \
+		--disable-dynamic-loading \
+		--enable-nyquist \
+		$(use_enable ladspa) \
+		$(use_enable vst) \
+		--with-wx-version=${WX_GTK_VER} \
+		--with-expat=system \
+		$(use_with ffmpeg) \
+		$(use_with lame) \
+		$(use_with flac libflac) \
+		$(use_with id3tag libid3tag) \
+		$(use_with mad libmad) \
+		$(use_with sbsms) \
+		--with-libsndfile=system \
+		$(use_with soundtouch) \
+		--with-libsoxr=system \
+		$(use_with twolame libtwolame) \
+		$(use_with vamp libvamp) \
+		$(use_with vorbis libvorbis) \
+		$(use_with lv2) \
+		--with-portaudio \
+		$(use_with midi) \
+		--with-widgetextra=local \
+		$(use_with portmixer)
+#		$(use_with alsa) \
+#		$(use_with jack)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+
+	use doc && dohtml -r "${WORKDIR}"/help/manual
+}
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index f1732761cd31..efb5914d2975 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -14,14 +14,15 @@
       quality than the included resampler and much faster than libsamplerate
       while keeping almost the same quality.
     </flag>
+    <flag name="lv2">Add support for Ladspa V2</flag>
     <flag name="midi">Enables MIDI support</flag>
-    <flag name="sbsms">Enables sbsms library support for pitch and tempo
-      changing
-    </flag>
+    <flag name="portmixer">Enable the internal portmixer feature</flag>
+    <flag name="sbsms">Enables sbsms library support for slower, more accurate
+      pitch and tempo changing</flag>
     <flag name="soundtouch">Enables soundtouch library support for pitch and
-      tempo changing
-    </flag>
+      tempo changing</flag>
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
     <flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag>
+    <flag name="vst">Enable VST plugin support</flag>
   </use>
 </pkgmetadata>