gentoo resync : 18.11.2018

3 files changed, 3 insertions, 110 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 1f6baa0173b8..5941ff7dd012 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,10 +1,7 @@
 AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805
 AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca
 AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
-DIST audacity-help-2.1.3.zip 20682229 BLAKE2B f3a7c5870c2fd10e5d1420c03ea608d39e9768989ac106b6b1554994646200fb58550bb07ba889002dc652e9c2ea5a16f2ee87daa1e66433fc6f322d24fbc564 SHA512 4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B 4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119 SHA512 96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
-EBUILD audacity-2.1.3-r1.ebuild 2716 BLAKE2B e382834bf933f73269c4122b173361d071a976d4dfc746559ac99ca953395fd22b8d1bc5aaf70393426cf08a97cc8a6d18aabaa9f2fdb737f9560a47c1ff7a20 SHA512 1d92991b6295ac279c898c94fa30c9928b596918a0425ca30f7acbf77e417dbf0ab8e819df14e93c69293f6fd63b80845c2943c4cb2635204d5596a552ff86c5
-EBUILD audacity-2.2.2.ebuild 3308 BLAKE2B cea563a92f65b102b1fa2eab190b653ee12d7abb16c1a89400de47681778c21c814d640bd15ccdf30fa218c1beb85f14a95ea3e918c716a9f3202106fea704d6 SHA512 fc58fcebfffeec13309b6570dec88314eab5cbbc98f1484096cb83992d34e42f4f2d70391be5c8791655939d452e91d0fd47558721d87ece383a74e98578462e
+EBUILD audacity-2.2.2.ebuild 3304 BLAKE2B f58a95c6a33bdc10f9ef661203ea9b8bfecdb488b1c37e3d42e09b4f05e647950cf1b82552d0352d573765f04085c09c6efe7d495004d39057aa2ec53a4a17a5 SHA512 dd9e585bc9c24418e0879b38d70e9cb7b81f2ddaa20eeaccca84874f060378f6cb445e1218f2b3ef0239e6fd150213ef8bc5838737b9ebfa26938ae162980b57
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.1.3-r1.ebuild b/media-sound/audacity/audacity-2.1.3-r1.ebuild
deleted file mode 100644
index 7c2c2b2d5b66..000000000000
--- a/media-sound/audacity/audacity-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets
-
-MY_P="${PN}-minsrc-${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${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:3.0[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= ) )
-	flac? ( >=media-libs/flac-1.3.1[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	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_configure() {
-	WX_GTK_VER="3.0"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	local myeconfargs=(
-		--disable-dynamic-loading
-		--enable-nyquist
-		--enable-unicode
-		--with-expat=system
-		--with-libsndfile=system
-		--with-libsoxr=system
-		--with-portaudio
-		--with-widgetextra=local
-		--with-wx-version=${WX_GTK_VER}
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable ladspa)
-		$(use_enable nls)
-		$(use_enable vst)
-		#$(use_with alsa)
-		$(use_with ffmpeg)
-		$(use_with flac libflac)
-		$(use_with id3tag libid3tag)
-		#$(use_with jack)
-		$(use_with lame)
-		$(use_with lv2)
-		$(use_with mad libmad)
-		$(use_with midi)
-		$(use_with sbsms)
-		$(use_with soundtouch)
-		$(use_with twolame libtwolame)
-		$(use_with vamp libvamp)
-		$(use_with vorbis libvorbis)
-		$(use_with portmixer)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove bad doc install
-	rm -r "${D}"/usr/share/doc || die
-
-	# Install our docs
-	dodoc README.txt
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/{m,man,manual}
-		dodoc "${WORKDIR}"/{favicon.ico,index.html,quick_help.html}
-	fi
-}
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index 13e4b20853c5..13149d281ebd 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
+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"