gentoo resync : 15.02.2018

11 files changed, 237 insertions, 135 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d84bf0a1d1d5..cc1995aa898c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index c383f1984dc3..5061f205af12 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -2,9 +2,13 @@ AUX csound-6.05-python.patch 661 BLAKE2B 4f0daaf04cafd5daa967409f7e49ae553e8751c
 AUX csound-6.09.1-python.patch 742 BLAKE2B b872878b91b5ad3200c78e0f5434f490e80f0879bb5cbaf9e2e4a53f9ea8ab29263fea84b81b13aea3dab1e79693901728e514519a3be7ce39c67c0e6bc17118 SHA512 52d2cb16831eb4090f22c7153f76213bbf4dfbf66ec791655714aa84db97dab6271022e64707247d24946ec5e019d20fe479a7a5d1711eac2c030625c4c86cdc
 DIST Csound6.09.1_manual_html.zip 15537547 BLAKE2B 8864cd42e811c596b1c17c68d0552edff39437412ce828772cf8cf13f47390d0edc25fa9a85ecfe1a50a01fe592cb0ee27ce5a11679195f8c1b41da9b1ede8cd SHA512 8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd
 DIST Csound6.09.1_manual_pdf.zip 8647957 BLAKE2B 52209784a08c67284a6481d17eaef8db2abf03f068bf347a40b06d4ba323389371474cb87fd93a318fe6abadeb69afd060be0aa64fdd2b638172ef33a282386a SHA512 1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b
+DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab SHA512 f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
+DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
 DIST csound-6.08.0.tar.gz 33948686 BLAKE2B 6a81e5806420b63ffd487d71d507d34336c46e91ec7073b4805324d04af31101c1ea65142f22aae2de071f149eb8fe4c88547b6795462aea248b585d029bad6c SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
 DIST csound-6.09.1.tar.gz 41969942 BLAKE2B 87dd02f61346f95648391c405edc18d08edad9d33c1cd2ab2cf054e0f10b7f987aaedce698a18520a8d8559d1fd78a20fa4f3d7db99e6afb3fdba316207e0495 SHA512 c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454
+DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
 EBUILD csound-6.08.0.ebuild 5569 BLAKE2B e134b89d7e62ba355621b3b57aa9b2b05df1477dc631ab33c05c5a1fcaa8def783138b6195f82a010e6f989904a2219499365a1fcb69f7579faeae2cd2932d3b SHA512 9bd0981e19af1f0c634d7d0f5a61f9738c65f8ab2cbdfd37d593327e6a8e2feb28be48dea052f6368bc007873ce5c61b17b45c7b381ca7139a8c7e0ef25f05d5
 EBUILD csound-6.09.1.ebuild 5972 BLAKE2B ec879625528671ccd4d82f14b71c2ce525260e8051986825f86ffd747e57dc0ed64af3fea6fe2eb3d316e54a89b235ceebd6577ab24b8834a9c59dc43b137cdb SHA512 e5be516ec79273158ee1b574753047b50ef980e0478a77a0fc73548083a7985b0befc074c9b71eb36fde943ef296b351e584b58adbd38a63276b2c71f2eaacd6
+EBUILD csound-6.10.0.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
 EBUILD csound-9999.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
 MISC metadata.xml 1612 BLAKE2B 0198bbe7fb501a97f7545c0e07e7bd5201c8f1b36a244f5df94b7773dee0a8104c497c7dd9af5abe978697a1978680381da745b0f7bed43fad04ed65dfe75cc5 SHA512 2a471051eddcd4e46a28e5101aac7d2ae3ffb3e19cfc0fa137e1445e502a3aba5a9c0e0fb4e40b8539715bee30be33bc80d66e2c8ac7cf40ee9834f15e52cbbf
diff --git a/media-sound/csound/csound-6.10.0.ebuild b/media-sound/csound/csound-6.10.0.ebuild
new file mode 100644
index 000000000000..5906af36652d
--- /dev/null
+++ b/media-sound/csound/csound-6.10.0.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound${PV}"
+	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
+portaudio portmidi pulseaudio python samples score static-libs stk tcl test
++threads +utils vim-syntax websocket"
+
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+
+REQUIRED_USE="
+	csoundac? ( || ( lua python ) )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+RDEPEND="
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	csoundac? (
+		x11-libs/fltk:1[threads?]
+		dev-cpp/eigen:3
+		dev-libs/boost:=
+	)
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	image? ( media-libs/libpng:0= )
+	jack? ( media-sound/jack-audio-connection-kit )
+	java? ( virtual/jdk:* )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( sci-mathematics/gmm )
+	lua? (
+		luajit? ( dev-lang/luajit:2 )
+		!luajit? ( dev-lang/lua:0 )
+	)
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	stk? ( media-libs/stk )
+	tcl? (
+		>=dev-lang/tcl-8.5:0=
+		>=dev-lang/tk-8.5:0=
+	)
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets )
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	csoundac? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	local lang
+	for lang in ${IUSE_LANGS} ; do
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
+		fi
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_ALSA=$(usex alsa)
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_CSOUND_AC=$(usex csoundac)
+		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
+		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DUSE_CURL=$(usex curl)
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DUSE_FLTK=$(usex fltk)
+		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DUSE_JACK=$(usex jack)
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_OPCODES=$(usex lua)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DUSE_GETTEXT=$(usex nls)
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DUSE_OPEN_MP=$(usex openmp)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DSCORE_PARSER=$(usex score)
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_STATIC_LIBRARY=$(usex test)
+		-DBUILD_TCLCSOUND=$(usex tcl)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DNEED_PORTTIME=OFF
+		-DBUILD_RELEASE=ON
+	)
+
+	use python && mycmakeargs+=(
+		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
+	)
+
+	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
+		-DUSE_LIB64=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc -r Release_Notes/.
+
+	# generate env.d file
+	cat > "${T}"/62${PN} <<-_EOF_ || die
+		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+		CSSTRNGS="${EPREFIX}/usr/share/locale"
+	_EOF_
+	if use stk ; then
+		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+	fi
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED%/}"/usr/bin/{,csound_}extract || die
+
+	use python && python_optimize
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/mp3_check/Manifest b/media-sound/mp3_check/Manifest
index f0c85980ee8c..82317ec02654 100644
--- a/media-sound/mp3_check/Manifest
+++ b/media-sound/mp3_check/Manifest
@@ -1,5 +1,5 @@
 AUX mp3_check-1.98-makefile.patch 605 BLAKE2B 8245fac6221ff1770dcf0e898adf207d123e9590ab1e97db6c2f257d9fc4a09f5f46784ddab7b846d02987b18576cee41b7a5b2352eb7bea8c333cffba5689b0 SHA512 53b1541b6644f32a03fb13c412badc2ecda775d605a3cb6aba6f97ca0d3dfe2fba80fc9e64f544a53ef55382afcc38eeb33dca837a997f3802155f38bdd0a447
 DIST mp3_check-1.98.tar.gz 83098 BLAKE2B 49f6a368ae0326aa426818e737964aa8019e09e8ed90316b333bee7aad973fdbd5ab9872ae1dcf41f8d9eed911b25c0b3b07f6dd5ba4557c6ed804c764186f87 SHA512 65eac5498ea3d4a63e0ab23c769a0baa233ddc863c907e934b691b1e8eb2a68da8a3bd7c6bd1b53d30d06330ab84d615c397753bb30257b0aac404e4b18ea4a3
-EBUILD mp3_check-1.98-r1.ebuild 661 BLAKE2B ffac9ab4195a8b92c820a3d99e13703dec3a3fa7c6f6abfb39cd157a9c86c2d41a7ef636acaa5db975fc70301a41e135d1c4b1d89a6c729ad71fb80c28aff91e SHA512 7f9cb85c353ad11ebfb3d13fb03703345f66cca04c757e19caf08161713b59132e615158924465da83aaa04c559fc1604d140d5e76918e85cf1f1e28390254bc
+EBUILD mp3_check-1.98-r1.ebuild 660 BLAKE2B f9d9cf96e788969840aaa81b57d9268235dc7182e953d07427517b51b2bb2e4f6235515e7c54cf562f96c957fba2a124e632227c898b4678db1c330d41e85aeb SHA512 840fc7b27fea392bcb1a54a306c3340b8ca9bfd5a87b774c364f0bfecb3ca53bf30b2b1b4f6172f1c2593101b4a33ac9b43e7de79938aefca29559ea18834edb
 EBUILD mp3_check-1.98.ebuild 615 BLAKE2B 65765714f97173c4fb83aca9df49f3f17a1b0c9c0e4ae77ed57fd69f637f70ddcdeff985c3bc89f5aa79132eb896f289480f5fd5b5a2468151834badad3ae5de SHA512 e58ffa203884ca0e71d1de02a8ee1c13878290d50e43dec90ee33c5ddecef0eb9973b288db847e60c6d20f7d11e67b667c083d52d055a9045c841cf3e1f63706
 MISC metadata.xml 393 BLAKE2B d4df38beb932debf1e099affcd85edf27cd78aa872ae91ef365f6037337892aa470011702e3df0efa7d602b0696dcf84e62637726932cfe5c83a3d293c55bf7e SHA512 1d249854ee7bae0e2b8f6c8de7539cb7a4593c76c35e4e938b578f0b866d8d9ef712fbf0f113a0d5370dfa28dfc760b668769a50f17333cf58bd38d4d66a8b22
diff --git a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
index e8590af4cc96..525ac68e69a9 100644
--- a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
+++ b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/media-sound/mp3diags/Manifest b/media-sound/mp3diags/Manifest
deleted file mode 100644
index c9801b0eafb6..000000000000
--- a/media-sound/mp3diags/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MP3Diags-1.2.03.tar.gz 1230173 BLAKE2B 59358018240e00c3662fc6f0a6881c889ef1c818669ce00b44af3672006ecd8eec52d34e4f2ec5873ad6478f5b74e2202cfcfb4bcb530dfd6e49de12ce9b30eb SHA512 0f7a5d300a3366a2b5ed3da78e1b1bf892618e19e6ea0de444cffea0926d8370f8309fae4fececcea4bf494b1b4b51ec6c382dbb7e46d8286c7580da18675fcf
-EBUILD mp3diags-1.2.03-r1.ebuild 976 BLAKE2B d87aa21afa3e59150dce8e013382895a61d3ebde3b1a0b8041be79a3585ecb28a1c71986b4ae1e284bcbe9267573c3edeb396f2974b26262bac0546cbe9db10e SHA512 df66f959a95f4e6d3eab27c9427853e5276fd2cb91463eb9871dd22d3507bf8d274c0147635782e4ef91e186d32b291187b5e9e2ebb419f2f8748d594a213df0
-MISC metadata.xml 325 BLAKE2B 870cebb344ed8489084785249735b311d133cfde185a1f241317d9db85c303d55fe00fdf1145e806226bfd8bb451783386b8cc94bf966d4dc271f01440f763c2 SHA512 d95070978fa178f56a68e1f84591437e268b82bc3fd9d749232da9f1f2b3ab294e91a53162c3df10ea1da06c2c4ea1e9c1b3de112d87d79e60a6077ca1c57211
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
deleted file mode 100644
index 15326088a6ed..000000000000
--- a/media-sound/mp3diags/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mp3diags</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/mp3diags/mp3diags-1.2.03-r1.ebuild b/media-sound/mp3diags/mp3diags-1.2.03-r1.ebuild
deleted file mode 100644
index d9c81af3d443..000000000000
--- a/media-sound/mp3diags/mp3diags-1.2.03-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils qmake-utils
-
-MY_PN=MP3Diags
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt-based MP3 diagnosis and repair tool"
-HOMEPAGE="http://mp3diags.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/boost:=[threads]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:4
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	eqmake4 ${PN}.pro
-}
-
-src_install() {
-	dobin bin/${MY_PN}
-	dodoc changelog.txt
-
-	local size
-	for size in 16 22 24 32 36 40 48; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins desktop/${MY_PN}${size}.png ${MY_PN}.png
-	done
-	domenu desktop/${MY_PN}.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 69b08c8f6172..ad381f807df1 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,5 +1,3 @@
-DIST soundconverter-2.1.6.tar.xz 195864 BLAKE2B 0be5f5df492742745f56ca3ba90faa134c11f802aefad359e1c03852c87be87e2c57afac811d4f17d2c9303d41e905fb0c9a8c9985c179d216a511183118d369 SHA512 d607d4c260f0b8d810f7251f9bbcd02359984dd2a8bf3340be14602e3392362b9a6bc54a9f0c20f16bfee2f971f784a4093f535307dfb2d6087fb4492511a9ba
 DIST soundconverter-3.0.0-beta1.tar.xz 196916 BLAKE2B 82832a151e030cbd2be129fe7f4dcd92430aadc71b163c3800cc2108f502020561e2c74291cbb25050ed42bd9d71fdfe310f107af84f612711554cf3e32fd07b SHA512 a27a2c7b4156a6d6c682424c5fa64a4dd82537b1dbfa8176fa39fbfc4d139a21b7dd042de80d088333c0aef0042a76940ab8da5d9708b6aac3399b32b7408f09
-EBUILD soundconverter-2.1.6.ebuild 1490 BLAKE2B e297e063dc167e5aedeaa72ab06636b905797a7ff0fd94ad6169317e7163fe199a3feed13231c72971c4d8451347691d6acc1d2291319c5a0816c1a1a151d028 SHA512 d74027db98593fcce85fa8a7a5ae965037ef53c5ac238a4f6a4457b87caa291907991badfecc35c3a9fb89d4128b662a3c61e6fa0b268e2b82c34f5e14f5f229
-EBUILD soundconverter-3.0.0_beta1.ebuild 1724 BLAKE2B e6a570798939c4570939dc0e8a9c7713e408b67fd7fbd029a3dae023171f991bc1c1311ad4b4c0064a53134507f67e36f98a2244e36469e1b9e8a718be3b0eb3 SHA512 ab6f36f0e7ca2e82dad02e7ce9567df646d17089f9874f3d478cc16d800edc5d7df460fa3f750508404e72d806591f96be3f3a79cb4bcf55ad299cef63d65452
+EBUILD soundconverter-3.0.0_beta1.ebuild 1723 BLAKE2B f23e65f31ea2707e8bced4de1a19813c5d0b140aa5e38c8d6b0dfa46a2a92a771b3d590e0479e88d2239eb6b95f126068e959fd8f1821a258682db02bb9d3e9c SHA512 703175800399bb19fed41bee82a0e839a10f0c1d36f9da5c7854d8d030788f246ffb449765e20651e42fa050e966e1e45c1ca01cbdd0f4002e6434f8777dbc16
 MISC metadata.xml 422 BLAKE2B c38fb6712043983aeaccb925b572fe26156e10776ff00ff454fd215ddedb0751d3c5f5a973725da4e765907f3c9d0ffe6f4062650a7afa2e092cd9b6930219b2 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732
diff --git a/media-sound/soundconverter/soundconverter-2.1.6.ebuild b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
deleted file mode 100644
index 0636d6903f5c..000000000000
--- a/media-sound/soundconverter/soundconverter-2.1.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="http://soundconverter.org/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac flac mp3 opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/gnome-vfs-python[${PYTHON_USEDEP}]
-	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-	dev-python/libgnome-python[${PYTHON_USEDEP}]
-	gnome-base/libglade[${PYTHON_USEDEP}]
-	aac? (
-		media-plugins/gst-plugins-faac:0.10
-		media-plugins/gst-plugins-faad:0.10 )
-	flac? ( media-plugins/gst-plugins-flac:0.10 )
-	mp3? (
-		media-plugins/gst-plugins-lame:0.10
-		media-plugins/gst-plugins-mad:0.10
-		media-plugins/gst-plugins-taglib:0.10 )
-	vorbis? (
-		media-plugins/gst-plugins-ogg:0.10
-		media-plugins/gst-plugins-vorbis:0.10 )
-	opus? (	media-plugins/gst-plugins-opus:0.10 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild b/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
index 9e6a1a333528..3a778827fb89 100644
--- a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aac flac libnotify mp3 ogg opus vorbis"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"